From 76ef77dc135573acc314848c6c24d423f1f09d88 Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Mon, 20 Apr 2020 22:01:02 -0400 Subject: [PATCH] Fix docker-build push action Signed-off-by: Dave Henderson --- .github/workflows/docker.yml | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 10c9f9fd..bc46192b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -56,18 +56,22 @@ jobs: docker pull localhost:5000/gomplate:latest-${{ github.sha }} docker pull localhost:5000/gomplate:slim-${{ github.sha }} docker pull localhost:5000/gomplate:alpine-${{ github.sha }} - - name: Re-tag and push (master) + - name: Re-tag and list images (non-master) run: | docker tag localhost:5000/gomplate:latest-${{ github.sha }} hairyhenderson/gomplate:latest docker tag localhost:5000/gomplate:slim-${{ github.sha }} hairyhenderson/gomplate:slim docker tag localhost:5000/gomplate:alpine-${{ github.sha }} hairyhenderson/gomplate:alpine - docker rmi localhost:5000/gomplate:latest-${{ github.sha }} - docker rmi localhost:5000/gomplate:slim-${{ github.sha }} - docker rmi localhost:5000/gomplate:alpine-${{ github.sha }} + docker images + if: github.repository != 'hairyhenderson/gomplate' || github.ref != 'refs/heads/master' + - name: Re-tag and push (master) + run: | + docker tag localhost:5000/gomplate:latest-${{ github.sha }} hairyhenderson/gomplate:latest + docker tag localhost:5000/gomplate:slim-${{ github.sha }} hairyhenderson/gomplate:slim + docker tag localhost:5000/gomplate:alpine-${{ github.sha }} hairyhenderson/gomplate:alpine docker images - # docker push hairyhenderson/gomplate + docker push hairyhenderson/gomplate if: github.repository == 'hairyhenderson/gomplate' && github.ref == 'refs/heads/master' - name: Re-tag and push (tagged release) run: | @@ -85,23 +89,6 @@ jobs: docker tag localhost:5000/gomplate:alpine-${{ github.sha }} hairyhenderson/gomplate:${major_version}-alpine docker tag localhost:5000/gomplate:alpine-${{ github.sha }} hairyhenderson/gomplate:stable-alpine - docker rmi localhost:5000/gomplate:latest-${{ github.sha }} - docker rmi localhost:5000/gomplate:slim-${{ github.sha }} - docker rmi localhost:5000/gomplate:alpine-${{ github.sha }} - docker images - # docker push hairyhenderson/gomplate - if: github.repository == 'hairyhenderson/gomplate' && contains(github.ref, 'v*') - - name: Re-tag and push (non-master dry run) - run: | - docker tag localhost:5000/gomplate:latest-${{ github.sha }} hairyhenderson/gomplate:latest - docker tag localhost:5000/gomplate:slim-${{ github.sha }} hairyhenderson/gomplate:slim - docker tag localhost:5000/gomplate:alpine-${{ github.sha }} hairyhenderson/gomplate:alpine - - docker rmi localhost:5000/gomplate:latest-${{ github.sha }} - docker rmi localhost:5000/gomplate:slim-${{ github.sha }} - docker rmi localhost:5000/gomplate:alpine-${{ github.sha }} - - docker images - # docker push hairyhenderson/gomplate - if: github.repository != 'hairyhenderson/gomplate' || github.ref != 'refs/heads/master' + docker push hairyhenderson/gomplate + if: github.repository == 'hairyhenderson/gomplate' && env.is_tag == 'true'