Make "Push Docker images" the same for master and PRs
@@ -76,7 +76,6 @@ jobs:
echo "REDSKYCTL_IMG=${DOCKER_REGISTRY}/redskyctl:${DOCKER_TAG}" >> $GITHUB_ENV
echo "SETUPTOOLS_IMG=${DOCKER_REGISTRY}/setuptools:${DOCKER_TAG}" >> $GITHUB_ENV
echo "PULL_POLICY=" >> $GITHUB_ENV
- echo "${{ secrets.BMASTERS_TOKEN }}" | docker login "ghcr.io" -u "${{ secrets.BMASTERS_ACTOR }}" --password-stdin
- name: Build controller
run: |
make docker-build-ci
@@ -90,9 +89,8 @@ jobs:
AC_IDENTITY_P12: ${{ secrets.AC_IDENTITY_P12 }}
- name: Push Docker images
run: |
+ echo "${{ secrets.BMASTERS_TOKEN }}" | docker login "ghcr.io" -u "${{ secrets.BMASTERS_ACTOR }}" --password-stdin
make docker-push
- - name: Push additional Docker tags
- run: |
docker-push() {
docker tag "$1" "$2"
docker push "$2"
