From ddf8fe3841808aec39e557154676b00d8cf5a404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Sch=C3=A4ferdiek?= Date: Wed, 11 Dec 2024 18:54:53 +0100 Subject: [PATCH] Oh my god --- .forgejo/workflows/build.yaml | 4 +++- .forgejo/workflows/release.yaml | 11 +++-------- .forgejo/workflows/release_rebuild.yaml | 10 ++-------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index affea56..24debd3 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -15,15 +15,17 @@ jobs: - name: Prepare requirements run: | apt-get update - apt-get install -y curl wget bash apt-transport-https ca-certificates gnupg zstd clang + apt-get install -y curl wget bash apt-transport-https ca-certificates gnupg zstd clang git curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker.gpg echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/debian bookworm stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null apt-get update apt-get -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin - name: Checkout uses: actions/checkout@v3 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + - name: Test docker image build uses: docker/build-push-action@v4 with: diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index 78d3577..94b7f6f 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -1,7 +1,8 @@ on: push: tags: - - "*" + - "latest" + - "v*" env: IMAGE_TAG_PRIVATE: git.myservermanager.com/msm/forgejo-base-executor-image FORGEJO_FQDN: git.myservermanager.com @@ -14,7 +15,7 @@ jobs: - name: Prepare requirements run: | apt-get update - apt-get install -y curl wget bash apt-transport-https ca-certificates gnupg zstd clang + apt-get install -y curl wget bash apt-transport-https ca-certificates gnupg zstd clang git curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker.gpg echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/debian bookworm stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null apt-get update @@ -33,12 +34,6 @@ jobs: username: ${{ secrets.FORGEJO_USER }} password: ${{ secrets.FORGEJO_TOKEN }} - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USER }} - password: ${{ secrets.DOCKERHUB_KEY }} - - name: Build docker image uses: docker/build-push-action@v4 with: diff --git a/.forgejo/workflows/release_rebuild.yaml b/.forgejo/workflows/release_rebuild.yaml index cf8ea41..811ca17 100644 --- a/.forgejo/workflows/release_rebuild.yaml +++ b/.forgejo/workflows/release_rebuild.yaml @@ -8,12 +8,12 @@ jobs: build: runs-on: docker container: - image: alpine:3.18 + image: node:20-bookworm steps: - name: Prepare requirements run: | apt-get update - apt-get install -y curl wget bash apt-transport-https ca-certificates gnupg zstd clang + apt-get install -y curl wget bash apt-transport-https ca-certificates gnupg zstd clang git curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker.gpg echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/debian bookworm stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null apt-get update @@ -32,12 +32,6 @@ jobs: username: ${{ secrets.FORGEJO_USER }} password: ${{ secrets.FORGEJO_TOKEN }} - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USER }} - password: ${{ secrets.DOCKERHUB_KEY }} - - name: Build docker image uses: docker/build-push-action@v4 with: