diff --git a/.github/workflows/action-test.yml b/.github/workflows/action-test.yml index 04b1add..d9ff90f 100644 --- a/.github/workflows/action-test.yml +++ b/.github/workflows/action-test.yml @@ -24,35 +24,20 @@ jobs: VERSION=latest SHORTREF=$(git rev-parse --short=8 ${{ inputs.tag }}) - VERSION=${{ inputs.tag }} + VERSION=${{ inputs.tag//v }} TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${SHORTREF}" + # If the VERSION looks like a version number, assume that + # this is the most recent version of the image and also + # tag it 'latest'. + if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then + TAGS="$TAGS,${DOCKER_IMAGE}:latest" + fi + + # Set output parameters. echo ::set-output name=tags::${TAGS} echo ::set-output name=docker_image::${DOCKER_IMAGE} - - name: Set up QEMU - uses: docker/setup-qemu-action@master - with: - platforms: all - - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@master - - - name: Login to DockerHub - if: github.event_name != 'pull_request' - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build - uses: docker/build-push-action@v2 - with: - builder: ${{ steps.buildx.outputs.name }} - context: . - file: ./Dockerfile - platforms: linux/amd64,linux/arm64,linux/ppc64le - push: true - tags: ${{ steps.prep.outputs.tags }} \ No newline at end of file + - name: get env + run: env \ No newline at end of file diff --git a/.github/workflows/docker-image-tags.yml b/.github/workflows/docker-image-tags.yml index 764497d..d701195 100644 --- a/.github/workflows/docker-image-tags.yml +++ b/.github/workflows/docker-image-tags.yml @@ -1,7 +1,10 @@ name: Docker Image Tags -on: workflow_dispatch - +on: + push: + tags: + - '**' + jobs: docker: runs-on: ubuntu-latest