Add cache to container build #35697
+109
−162
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -56,7 +56,7 @@ 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-container: | ||
| runs-on: namespace-profile-gitea-release-docker | ||
| permissions: | ||
| packages: write # to publish to ghcr.io | ||
|
|
@@ -65,17 +65,36 @@ jobs: | |
| # 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 | ||
| - name: Get cleaned branch name | ||
| id: clean_name | ||
| run: | | ||
| 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" | ||
| - uses: docker/metadata-action@v5 | ||
| id: meta | ||
| with: | ||
| images: |- | ||
| gitea/gitea | ||
| ghcr.io/go-gitea/gitea | ||
| tags: | | ||
| type=raw,value=${{ steps.clean_name.outputs.branch }} | ||
| annotations: | | ||
| org.opencontainers.image.authors="[email protected]" | ||
| - uses: docker/metadata-action@v5 | ||
| id: meta_rootless | ||
| with: | ||
| images: |- | ||
| gitea/gitea | ||
| ghcr.io/go-gitea/gitea | ||
| # each tag below will have the suffix of -rootless | ||
| flavor: | | ||
| suffix=-rootless | ||
| tags: | | ||
| type=raw,value=${{ steps.clean_name.outputs.branch }} | ||
| annotations: | | ||
| org.opencontainers.image.authors="[email protected]" | ||
| - name: Login to Docker Hub | ||
| uses: docker/login-action@v3 | ||
| with: | ||
|
|
@@ -87,57 +106,20 @@ jobs: | |
| registry: ghcr.io | ||
| username: ${{ github.repository_owner }} | ||
| password: ${{ secrets.GITHUB_TOKEN }} | ||
| - name: build regular docker image | ||
| uses: docker/build-push-action@v5 | ||
| with: | ||
| context: . | ||
| platforms: linux/amd64,linux/arm64,linux/riscv64 | ||
| push: true | ||
| tags: ${{ steps.meta.outputs.tags }} | ||
| annotations: ${{ steps.meta.outputs.annotations }} | ||
| - name: build rootless docker image | ||
| uses: docker/build-push-action@v5 | ||
| with: | ||
| context: . | ||
| platforms: linux/amd64,linux/arm64,linux/riscv64 | ||
| push: true | ||
| file: Dockerfile.rootless | ||
| tags: ${{ steps.meta_rootless.outputs.tags }} | ||
lunny marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| annotations: ${{ steps.meta_rootless.outputs.annotations }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -66,7 +66,7 @@ jobs: | |
| gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --draft --notes-from-tag dist/release/* | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} | ||
| container: | ||
| runs-on: namespace-profile-gitea-release-docker | ||
| permissions: | ||
| packages: write # to publish to ghcr.io | ||
|
|
@@ -88,38 +88,10 @@ jobs: | |
| # 1.2.3-rc0 | ||
| tags: | | ||
| type=semver,pattern={{version}} | ||
| annotations: | | ||
| org.opencontainers.image.authors="[email protected]" | ||
|
There was a problem hiding this comment. Just add this to the Dockerfiles instead: LABEL org.opencontainers.image.authors="[email protected]"Ref: https://docs.docker.com/reference/build-checks/maintainer-deprecated/ There was a problem hiding this comment. Note, Dockerfiles do already have a Line 45 in 8085c75 It's probably better to use There was a problem hiding this comment. I moved it to tag generation to avoid having implicitly marking user built containers as maintained by gitea, but I can move back into the container if it's not a concern. There was a problem hiding this comment. Hmm makes sense your way I guess. Would just like to avoid duplication. |
||
| - uses: docker/metadata-action@v5 | ||
| id: meta_rootless | ||
| with: | ||
| images: |- | ||
| gitea/gitea | ||
|
|
@@ -131,6 +103,8 @@ jobs: | |
| # 1.2.3-rc0 | ||
| tags: | | ||
| type=semver,pattern={{version}} | ||
| annotations: | | ||
| org.opencontainers.image.authors="[email protected]" | ||
| - name: Login to Docker Hub | ||
| uses: docker/login-action@v3 | ||
| with: | ||
|
|
@@ -142,12 +116,20 @@ jobs: | |
| registry: ghcr.io | ||
| username: ${{ github.repository_owner }} | ||
| password: ${{ secrets.GITHUB_TOKEN }} | ||
| - name: build regular container image | ||
| uses: docker/build-push-action@v5 | ||
| with: | ||
| context: . | ||
| platforms: linux/amd64,linux/arm64,linux/riscv64 | ||
| push: true | ||
| tags: ${{ steps.meta.outputs.tags }} | ||
| annotations: ${{ steps.meta.outputs.annotations }} | ||
| - name: build rootless container image | ||
| uses: docker/build-push-action@v5 | ||
| with: | ||
| context: . | ||
| platforms: linux/amd64,linux/arm64,linux/riscv64 | ||
| push: true | ||
| file: Dockerfile.rootless | ||
| tags: ${{ steps.meta_rootless.outputs.tags }} | ||
| annotations: ${{ steps.meta_rootless.outputs.annotations }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -70,7 +70,7 @@ jobs: | |
| gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --notes-from-tag dist/release/* | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} | ||
| container: | ||
| runs-on: namespace-profile-gitea-release-docker | ||
| permissions: | ||
| packages: write # to publish to ghcr.io | ||
|
|
@@ -96,36 +96,10 @@ jobs: | |
| type=semver,pattern={{version}} | ||
| type=semver,pattern={{major}} | ||
| type=semver,pattern={{major}}.{{minor}} | ||
| annotations: | | ||
| org.opencontainers.image.authors="[email protected]" | ||
| - uses: docker/metadata-action@v5 | ||
| id: meta_rootless | ||
| with: | ||
| images: |- | ||
| gitea/gitea | ||
|
|
@@ -142,6 +116,8 @@ jobs: | |
| type=semver,pattern={{version}} | ||
| type=semver,pattern={{major}} | ||
| type=semver,pattern={{major}}.{{minor}} | ||
| annotations: | | ||
| org.opencontainers.image.authors="[email protected]" | ||
| - name: Login to Docker Hub | ||
| uses: docker/login-action@v3 | ||
| with: | ||
|
|
@@ -153,12 +129,20 @@ jobs: | |
| registry: ghcr.io | ||
| username: ${{ github.repository_owner }} | ||
| password: ${{ secrets.GITHUB_TOKEN }} | ||
| - name: build regular container image | ||
| uses: docker/build-push-action@v5 | ||
| with: | ||
| context: . | ||
| platforms: linux/amd64,linux/arm64,linux/riscv64 | ||
| push: true | ||
| tags: ${{ steps.meta.outputs.tags }} | ||
| annotations: ${{ steps.meta.outputs.annotations }} | ||
| - name: build rootless container image | ||
| uses: docker/build-push-action@v5 | ||
| with: | ||
| context: . | ||
| platforms: linux/amd64,linux/arm64,linux/riscv64 | ||
| push: true | ||
| file: Dockerfile.rootless | ||
| tags: ${{ steps.meta_rootless.outputs.tags }} | ||
| annotations: ${{ steps.meta_rootless.outputs.annotations }} | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.