Reduce incremental Docker build times

.dockerignore

@@ -111,3 +111,7 @@ prime/
 
 # Manpage
 /man
+
+Dockerfile
+.dockerignore
+.github/

.github/labeler.yml

@@ -24,7 +24,6 @@ modifies/migrations:
 modifies/internal:
   - "Makefile"
   - "Dockerfile"
-  - "Dockerfile.rootless"
   - "docker/**"
   - "webpack.config.js"
   - ".eslintrc.yaml"

.github/workflows/files-changed.yml

@@ -78,7 +78,6 @@ jobs:
 
             docker:
               - "Dockerfile"
-              - "Dockerfile.rootless"
               - "docker/**"
               - "Makefile"
 

.github/workflows/pull-docker-dryrun.yml

@@ -11,25 +11,21 @@ jobs:
   files-changed:
     uses: ./.github/workflows/files-changed.yml
 
-  regular:
+  docker:
     if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.actions == 'true'
     needs: files-changed
     runs-on: ubuntu-latest
     steps:
       - uses: docker/setup-buildx-action@v3
       - uses: docker/build-push-action@v5
         with:
+          target: gitea
+          pull: true
           push: false
           tags: gitea/gitea:linux-amd64
-
-  rootless:
-    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.actions == 'true'
-    needs: files-changed
-    runs-on: ubuntu-latest
-    steps:
-      - uses: docker/setup-buildx-action@v3
       - uses: docker/build-push-action@v5
         with:
+          target: gitea-rootless
+          pull: true
           push: false
-          file: Dockerfile.rootless
           tags: gitea/gitea:linux-amd64

.github/workflows/release-nightly.yml

@@ -57,17 +57,13 @@ jobs:
       - name: upload binaries to s3
         run: |
           aws s3 sync dist/release s3://${{ secrets.AWS_S3_BUCKET }}/gitea/${{ steps.clean_name.outputs.branch }} --no-progress
-  nightly-docker-rootful:
+  nightly-docker:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       # fetch all commits instead of only the last as some branches are long lived and could have many between versions
       # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
       - run: git fetch --unshallow --quiet --tags --force
-      - uses: actions/setup-go@v4
-        with:
-          go-version-file: go.mod
-          check-latest: true
       - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
       - name: Get cleaned branch name
@@ -80,55 +76,36 @@ jobs:
           fi
           REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
           echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
+      - name: Get nightly version
+        run: echo "NIGHTLY_VERSION=$(git describe --tags --always | sed 's/-/+/' | sed 's/^v//')" >> $GITHUB_ENV
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: fetch go modules
-        run: make vendor
       - name: build rootful docker image
         uses: docker/build-push-action@v5
         with:
           context: .
+          target: gitea
+          build-args:
+            - GITHUB_REF_NAME=${{ env.GITHUB_REF_NAME }}
+            - GITHUB_REF_TYPE=${{ env.GITHUB_REF_TYPE }}
+            - DOCKER_GITEA_VERSION=${{ env.NIGHTLY_VERSION }}
           platforms: linux/amd64,linux/arm64
+          pull: true
           push: true
           tags: gitea/gitea:${{ steps.clean_name.outputs.branch }}
-  nightly-docker-rootless:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
-      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
-      - run: git fetch --unshallow --quiet --tags --force
-      - uses: actions/setup-go@v4
-        with:
-          go-version-file: go.mod
-          check-latest: true
-      - uses: docker/setup-qemu-action@v3
-      - uses: docker/setup-buildx-action@v3
-      - name: Get cleaned branch name
-        id: clean_name
-        run: |
-          # if main then say nightly otherwise cleanup name
-          if [ "${{ github.ref }}" = "refs/heads/main" ]; then
-            echo "branch=nightly" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
-          echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: fetch go modules
-        run: make vendor
       - name: build rootless docker image
         uses: docker/build-push-action@v5
         with:
           context: .
+          target: gitea-rootless
+          build-args:
+            - GITHUB_REF_NAME=${{ env.GITHUB_REF_NAME }}
+            - GITHUB_REF_TYPE=${{ env.GITHUB_REF_TYPE }}
+            - DOCKER_GITEA_VERSION=${{ env.NIGHTLY_VERSION }}
           platforms: linux/amd64,linux/arm64
+          pull: true
           push: true
-          file: Dockerfile.rootless
           tags: gitea/gitea:${{ steps.clean_name.outputs.branch }}-rootless

.github/workflows/release-tag-rc.yml

@@ -61,46 +61,21 @@ jobs:
           gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --draft --notes-from-tag dist/release/*
         env:
           GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-  docker-rootful:
+  docker:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
-      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
-      - run: git fetch --unshallow --quiet --tags --force
       - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
       - uses: docker/metadata-action@v5
-        id: meta
+        id: meta-rootful
         with:
           images: gitea/gitea
           # 1.2.3-rc0
           tags: |
             type=semver,pattern={{version}}
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: build rootful docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-  docker-rootless:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
-      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
-      - run: git fetch --unshallow --quiet --tags --force
-      - uses: docker/setup-qemu-action@v3
-      - uses: docker/setup-buildx-action@v3
       - uses: docker/metadata-action@v5
-        id: meta
+        id: meta-rootless
         with:
           images: gitea/gitea
           # each tag below will have the suffix of -rootless
@@ -114,12 +89,29 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: build rootful docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          target: gitea
+          build-args:
+            - GITHUB_REF_NAME=${{ env.GITHUB_REF_NAME }}
+            - GITHUB_REF_TYPE=${{ env.GITHUB_REF_TYPE }}
+          platforms: linux/amd64,linux/arm64
+          pull: true
+          push: true
+          tags: ${{ steps.meta-rootful.outputs.tags }}
+          labels: ${{ steps.meta-rootful.outputs.labels }}
       - name: build rootless docker image
         uses: docker/build-push-action@v5
         with:
           context: .
+          target: gitea-rootless
+          build-args:
+            - GITHUB_REF_NAME=${{ env.GITHUB_REF_NAME }}
+            - GITHUB_REF_TYPE=${{ env.GITHUB_REF_TYPE }}
           platforms: linux/amd64,linux/arm64
+          pull: true
           push: true
-          file: Dockerfile.rootless
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta-rootless.outputs.tags }}
+          labels: ${{ steps.meta-rootless.outputs.labels }}

.github/workflows/release-tag-version.yml

@@ -63,17 +63,13 @@ jobs:
           gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --draft --notes-from-tag dist/release/*
         env:
           GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-  docker-rootful:
+  docker:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
-      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
-      - run: git fetch --unshallow --quiet --tags --force
-      - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
       - uses: docker/metadata-action@v5
-        id: meta
+        id: meta-rootful
         with:
           images: gitea/gitea
           # this will generate tags in the following format:
@@ -86,30 +82,8 @@ jobs:
             type=semver,pattern={{major}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{version}}
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: build rootful docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-  docker-rootless:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
-      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
-      - run: git fetch --unshallow --quiet --tags --force
-      - uses: docker/setup-qemu-action@v3
-      - uses: docker/setup-buildx-action@v3
       - uses: docker/metadata-action@v5
-        id: meta
+        id: meta-rootless
         with:
           images: gitea/gitea
           # each tag below will have the suffix of -rootless
@@ -130,12 +104,29 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: build rootful docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          target: gitea
+          build-args:
+            - GITHUB_REF_NAME=${{ env.GITHUB_REF_NAME }}
+            - GITHUB_REF_TYPE=${{ env.GITHUB_REF_TYPE }}
+          platforms: linux/amd64,linux/arm64
+          pull: true
+          push: true
+          tags: ${{ steps.meta-rootful.outputs.tags }}
+          labels: ${{ steps.meta-rootful.outputs.labels }}
       - name: build rootless docker image
         uses: docker/build-push-action@v5
         with:
           context: .
+          target: gitea-rootless
+          build-args:
+            - GITHUB_REF_NAME=${{ env.GITHUB_REF_NAME }}
+            - GITHUB_REF_TYPE=${{ env.GITHUB_REF_TYPE }}
           platforms: linux/amd64,linux/arm64
+          pull: true
           push: true
-          file: Dockerfile.rootless
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta-rootless.outputs.tags }}
+          labels: ${{ steps.meta-rootless.outputs.labels }}