Add cache to container build #35697
+106
−164
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
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="maintainers@gitea.io" | ||
|
There was a problem hiding this comment. Just add this to the Dockerfiles instead: LABEL org.opencontainers.image.authors="maintainers@gitea.io"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="maintainers@gitea.io" | ||
| - 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why no leading slash? Imho it's better to exactly ignore these files in the root, not ignore them anywhere in the tree.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually I think maybe they don't need to be ignored? I guess there should be nothing wrong by keeping them