forked from Mouws/protonmail-bridge-nextcoud-podman
Fix multiarch workflow
This commit is contained in:
parent
635fb1d8b1
commit
629272c730
10
.github/workflows/build.yaml
vendored
10
.github/workflows/build.yaml
vendored
@ -16,7 +16,7 @@ on:
|
||||
- build/VERSION
|
||||
|
||||
env:
|
||||
DOCKER_TAG: shenxn/protonmail-bridge
|
||||
DOCKER_REPO: shenxn/protonmail-bridge
|
||||
|
||||
jobs:
|
||||
build:
|
||||
@ -24,12 +24,10 @@ jobs:
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@master
|
||||
- name: Docker login
|
||||
uses: azure/docker-login@v1
|
||||
with:
|
||||
username: ${{ secrets.REGISTRY_USERNAME }}
|
||||
password: ${{ secrets.REGISTRY_USERNAME }}
|
||||
- name: Set up Docker buildx
|
||||
uses: crazy-max/ghaction-docker-buildx@v2
|
||||
- name: Build image
|
||||
run: bash build/build-docker.sh
|
||||
env:
|
||||
DOCKER_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
|
||||
DOCKER_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
|
||||
|
||||
@ -11,11 +11,14 @@ cd $SCRIPTPATH
|
||||
VERSION=`cat VERSION`
|
||||
if [[ $GITHUB_REF == "refs/heads/master" ]]; then
|
||||
TAG_TYPE="build"
|
||||
TAG_VERTION="${VERSION}-build"
|
||||
TAG_VERSION="${VERSION}-build"
|
||||
else
|
||||
TAG_TYPE="build-dev"
|
||||
TAG_VERTION="${VERSION}-build-dev"
|
||||
TAG_VERSION="${VERSION}-build-dev"
|
||||
fi
|
||||
|
||||
# Docker login
|
||||
echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
|
||||
|
||||
# Build multiarch and push
|
||||
docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t ${DOCKER_REPO}:${TAG_TYPE} -t ${DOCKER_REPO}:${TAG_VERSION} --push .
|
||||
docker buildx build $BUILD_ARGS --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t ${DOCKER_REPO}:${TAG_TYPE} -t ${DOCKER_REPO}:${TAG_VERSION} --push .
|
||||
|
||||
Loading…
Reference in New Issue
Block a user