Use crazy-max/ghaction-docker-login action

This commit is contained in:
CrazyMax
2020-08-15 16:46:27 +02:00
parent d2239ccbde
commit d95d274d3b
2 changed files with 6 additions and 13 deletions

View File

@@ -92,7 +92,6 @@ jobs:
name: Prepare name: Prepare
id: prepare id: prepare
run: | run: |
DOCKER_USERNAME=crazymax
DOCKER_IMAGE=crazymax/diun DOCKER_IMAGE=crazymax/diun
DOCKER_PLATFORMS=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le,linux/s390x DOCKER_PLATFORMS=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le,linux/s390x
VERSION=edge VERSION=edge
@@ -106,7 +105,6 @@ jobs:
TAGS="$TAGS --tag ${DOCKER_IMAGE}:latest" TAGS="$TAGS --tag ${DOCKER_IMAGE}:latest"
fi fi
echo ::set-output name=docker_username::${DOCKER_USERNAME}
echo ::set-output name=docker_image::${DOCKER_IMAGE} echo ::set-output name=docker_image::${DOCKER_IMAGE}
echo ::set-output name=version::${VERSION} echo ::set-output name=version::${VERSION}
echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \ echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
@@ -122,12 +120,12 @@ jobs:
run: | run: |
docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }} docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
- -
name: Docker Login name: Login to DockerHub
if: success() && github.event_name != 'pull_request' && (endsWith(github.ref, github.event.repository.default_branch) || startsWith(github.ref, 'refs/tags/')) if: success() && github.event_name != 'pull_request' && (endsWith(github.ref, github.event.repository.default_branch) || startsWith(github.ref, 'refs/tags/'))
env: uses: crazy-max/ghaction-docker-login@v1.1.0
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} with:
run: | username: ${{ secrets.DOCKER_USERNAME }}
echo "${DOCKER_PASSWORD}" | docker login --username "${{ steps.prepare.outputs.docker_username }}" --password-stdin password: ${{ secrets.DOCKER_PASSWORD }}
- -
name: Docker Buildx (push) name: Docker Buildx (push)
if: success() && github.event_name != 'pull_request' && (endsWith(github.ref, github.event.repository.default_branch) || startsWith(github.ref, 'refs/tags/')) if: success() && github.event_name != 'pull_request' && (endsWith(github.ref, github.event.repository.default_branch) || startsWith(github.ref, 'refs/tags/'))
@@ -138,8 +136,3 @@ jobs:
if: success() && github.event_name != 'pull_request' && (endsWith(github.ref, github.event.repository.default_branch) || startsWith(github.ref, 'refs/tags/')) if: success() && github.event_name != 'pull_request' && (endsWith(github.ref, github.event.repository.default_branch) || startsWith(github.ref, 'refs/tags/'))
run: | run: |
docker run --rm mplatform/mquery ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }} docker run --rm mplatform/mquery ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}
-
name: Clear
if: always() && github.event_name != 'pull_request' && (endsWith(github.ref, github.event.repository.default_branch) || startsWith(github.ref, 'refs/tags/'))
run: |
rm -f ${HOME}/.docker/config.json

View File

@@ -1,4 +1,4 @@
<p align="center"><a href="https://github.com/crazy-max/diun" target="_blank"><img height="128" src="https://raw.githubusercontent.com/crazy-max/diun/master/.res/diun.png"></a></p> <p align="center"><a href="https://crazy-max.github.io/diun/" target="_blank"><img height="128" src="https://raw.githubusercontent.com/crazy-max/diun/master/.res/diun.png"></a></p>
<p align="center"> <p align="center">
<a href="https://crazy-max.github.io/diun/"><img src="https://img.shields.io/badge/doc-mkdocs-02a6f2?style=flat-square&logo=read-the-docs" alt="Documentation"></a> <a href="https://crazy-max.github.io/diun/"><img src="https://img.shields.io/badge/doc-mkdocs-02a6f2?style=flat-square&logo=read-the-docs" alt="Documentation"></a>