Migrate to build-push-action@v2

This commit is contained in:
Xiaonan Shen 2020-11-19 17:57:37 -08:00
parent 1cc5a55844
commit f71480f97d
2 changed files with 23 additions and 18 deletions

View File

@ -12,11 +12,11 @@ on:
- entrypoint.sh - entrypoint.sh
- gpgparams - gpgparams
- install.sh - install.sh
- set-env.sh
- VERSION - VERSION
env: env:
DOCKER_REPO: shenxn/protonmail-bridge DOCKER_REPO: shenxn/protonmail-bridge
DOCKER_REPO_DEV: shenxn/protonmail-bridge-dev
jobs: jobs:
build: build:
@ -24,12 +24,28 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@master uses: actions/checkout@master
- name: Set Env - name: Set version
run: bash set-env.sh id: version
- uses: docker/build-push-action@v1 run: echo "::set-output name=version::`cat VERSION`"
- name: Set repo
id: repo
run: if [[ $GITHUB_REF == "refs/heads/master" ]]; then echo "::set-output name=repo::${DOCKER_REPO}"; else echo "::set-output name=repo::${DOCKER_REPO_DEV}"; fi
- name: Docker meta
id: docker_meta
uses: crazy-max/ghaction-docker-meta@v1
with:
images: ${{ steps.repo.outputs.repo }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Login to DockerHub
uses: docker/login-action@v1
with: with:
username: ${{ secrets.REGISTRY_USERNAME }} username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }} password: ${{ secrets.REGISTRY_PASSWORD }}
repository: shenxn/protonmail-bridge - uses: docker/build-push-action@v2
tags: ${{ env.TAGS }} with:
add_git_labels: true tags: |
${{ steps.repo.outputs.repo }}:latest
${{ steps.repo.outputs.repo }}:${{ steps.version.outputs.version }}
labels: ${{ steps.docker_meta.outputs.labels }}
push: true

View File

@ -1,11 +0,0 @@
#!/bin/bash
set -ex
VERSION=`cat VERSION`
if [[ $GITHUB_REF == "refs/heads/master" ]]; then
echo "TAGS=latest,${VERSION}" >> $GITHUB_ENV
else
echo "TAGS=dev,${VERSION}-dev" >> $GITHUB_ENV
fi