Skip to content

Commit 52657e1

Browse files
committed
Make conditional on having DOCKER_USERNAME and DOCKER_PASSWORD secret keys, github packages does not support multiarch
Signed-off-by: miigotu <[email protected]>
1 parent e3c093f commit 52657e1

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

.github/workflows/deploy.yaml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ jobs:
3333
run: |
3434
# echo ::set-output name=docker_platforms::linux/amd64,linux/386
3535
echo ::set-output name=docker_platforms::linux/amd64
36-
echo ::set-output name=docker_username::miigotu
37-
echo ::set-output name=github_image::docker.pkg.github.com/${GITHUB_REPOSITORY,,}/ps3toolchain
36+
echo ::set-output name=github_image::docker.pkg.github.com/${GITHUB_REPOSITORY,,}/ps3dev
37+
# echo ::set-output name=docker_image::docker.io/${GITHUB_REPOSITORY,,}
38+
echo ::set-output name=docker_image::docker.io/ps3dev/ps3dev
3839
VERSION_TAG=${GITHUB_REF#refs/*/}
3940
echo ::set-output name=version::${VERSION_TAG%/merge}
4041
- name: Available platforms
@@ -44,12 +45,16 @@ jobs:
4445
if: success()
4546
id: login
4647
env:
48+
GITHUB_USERNAME: ${{ github.actor }}
4749
GITHUB_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
50+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
51+
DOCKER_PASSWORD: ${{ secrets.DOCKER_TOKEN }}
4852
run: |
49-
echo "${GITHUB_PASSWORD}" | docker login --username "${{ steps.prepare.outputs.docker_username }}" --password-stdin docker.pkg.github.com
53+
echo "${GITHUB_PASSWORD}" | docker login --username "${GITHUB_USERNAME}" --password-stdin docker.pkg.github.com
54+
echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin docker.io
5055
echo ::set-output name=buildx::$(echo docker buildx build --output type=image,push=true \
5156
--platform ${{ steps.prepare.outputs.docker_platforms }} --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" \
52-
--tag "${{ steps.prepare.outputs.github_image }}:${{ steps.prepare.outputs.version }}")
57+
--tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}")
5358
- name: Cache Docker layers
5459
uses: actions/cache@v2
5560
id: cache
@@ -59,11 +64,11 @@ jobs:
5964
restore-keys: |
6065
${{ runner.os }}-buildx-
6166
- name: Run Buildx (master)
62-
if: success() && steps.prepare.outputs.version == 'master'
67+
if: secrets.DOCKER_USERNAME && secrets.DOCKER_PASSWORD && success() && steps.prepare.outputs.version == 'master'
6368
run: |
64-
${{ steps.login.outputs.buildx }} --tag "${{ steps.prepare.outputs.github_image }}:latest" --file Dockerfile .
69+
${{ steps.login.outputs.buildx }} --tag "${{ steps.prepare.outputs.docker }}:latest" --file Dockerfile .
6570
- name: Run Buildx (non-master)
66-
if: success() && steps.prepare.outputs.version != 'master'
71+
if: secrets.DOCKER_USERNAME && secrets.DOCKER_PASSWORD && success() && steps.prepare.outputs.version != 'master'
6772
run: |
6873
${{ steps.login.outputs.buildx }} --file Dockerfile .
6974
- name: Clear

0 commit comments

Comments
 (0)