danvics/ytdl-sub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[DOCKER] Properly tag ubuntu image (#546)

Browse source 
* [DOCKER] Properly tag ubuntu image

* unique keys
This commit is contained in:
Jesse Bannon 2023-03-15 14:59:52 -07:00 committed by GitHub
parent 52fdc9a213
commit c87b595f66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.github/workflows/package-ubuntu.yaml vendored
View file

@ -89,7 +89,7 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: /tmp/build-cache/arm64 path: /tmp/build-cache/arm64
key: ${{github.sha}} key: ${{github.sha}}-arm64
# Build AMD64 container # Build AMD64 container
@ -133,7 +133,7 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: /tmp/build-cache/amd64 path: /tmp/build-cache/amd64
key: ${{github.sha}} key: ${{github.sha}}-amd64
# On master branch, build the docker manifest file from the cached # On master branch, build the docker manifest file from the cached
@ -141,6 +141,7 @@ jobs:
deploy: deploy:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
needs: [ needs: [
build,
package-arm64, package-arm64,
package-amd64 package-amd64
] ]
@ -178,13 +179,13 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: /tmp/build-cache/arm64 path: /tmp/build-cache/arm64
key: ${{github.sha}} key: ${{github.sha}}-arm64
- name: Restore AMD64 build cache - name: Restore AMD64 build cache
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: /tmp/build-cache/amd64 path: /tmp/build-cache/amd64
key: ${{github.sha}} key: ${{github.sha}}-amd64
- name: Format image_id - name: Format image_id
id: formatted-image_id id: formatted-image_id
@ -216,7 +217,7 @@ jobs:
--platform=linux/amd64,linux/arm64 \ --platform=linux/amd64,linux/arm64 \
--cache-from=type=local,src=/tmp/build-cache/amd64 \ --cache-from=type=local,src=/tmp/build-cache/amd64 \
--cache-from=type=local,src=/tmp/build-cache/arm64 \ --cache-from=type=local,src=/tmp/build-cache/arm64 \
--tag ubuntu-${{ steps.formatted-image_id.outputs.IMAGE_ID }}:ubuntu-${{ steps.formatted_version.outputs.VERSION }} \ --tag ${{ steps.formatted-image_id.outputs.IMAGE_ID }}:ubuntu-${{ steps.formatted_version.outputs.VERSION }} \
--label "runnumber=ubuntu-${GITHUB_RUN_ID}" \ --label "runnumber=ubuntu-${GITHUB_RUN_ID}" \
--file docker/Dockerfile.ubuntu \ --file docker/Dockerfile.ubuntu \
docker/ docker/

9
.github/workflows/package.yaml vendored
View file

@ -88,7 +88,7 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: /tmp/build-cache/arm64 path: /tmp/build-cache/arm64
key: ${{github.sha}} key: ${{github.sha}}-arm64
# Build AMD64 container # Build AMD64 container
@ -131,7 +131,7 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: /tmp/build-cache/amd64 path: /tmp/build-cache/amd64
key: ${{github.sha}} key: ${{github.sha}}-amd64
# On master branch, build the docker manifest file from the cached # On master branch, build the docker manifest file from the cached
@ -139,6 +139,7 @@ jobs:
deploy: deploy:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
needs: [ needs: [
build,
package-arm64, package-arm64,
package-amd64 package-amd64
] ]
@ -176,13 +177,13 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: /tmp/build-cache/arm64 path: /tmp/build-cache/arm64
key: ${{github.sha}} key: ${{github.sha}}-arm64
- name: Restore AMD64 build cache - name: Restore AMD64 build cache
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: /tmp/build-cache/amd64 path: /tmp/build-cache/amd64
key: ${{github.sha}} key: ${{github.sha}}-amd64
- name: Format image_id - name: Format image_id
id: formatted-image_id id: formatted-image_id