diff --git a/.github/workflows/docker-description.yml b/.github/workflows/docker-description.yml index ee4f3b5..4cafb0c 100644 --- a/.github/workflows/docker-description.yml +++ b/.github/workflows/docker-description.yml @@ -13,6 +13,6 @@ jobs: - name: Docker Hub Description uses: peter-evans/dockerhub-description@v2.4.1 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} repository: peterevans/dockerhub-description diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 9ed6f62..4165d23 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16,6 +16,8 @@ jobs: uses: actions/checkout@v2 - name: build env: + DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} VERSION_SHORT: ${{ matrix.version }} run: | ./build.sh ${{ matrix.version }} @@ -27,6 +29,8 @@ jobs: uses: actions/checkout@v2 - name: build env: + DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} EXTRA_TAG: stable VERSION_SHORT: 1.0 run: | @@ -39,6 +43,8 @@ jobs: uses: actions/checkout@v2 - name: build env: + DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} EXTRA_TAG: latest VERSION_SHORT: 1.1 run: | diff --git a/build.sh b/build.sh index b6bfdad..686cdbf 100755 --- a/build.sh +++ b/build.sh @@ -50,7 +50,7 @@ else fi # Travis gets rate limited by Docker HUB. -if [[ ${CI:-} == true && -n $DOCKER_PASSWORD && -n $DOCKER_USERNAME ]]; then +if [[ ${CI:-} == true && -n ${DOCKER_PASSWORD:-} && -n ${DOCKER_USERNAME:-} ]]; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin fi