More updated following PR comments
This commit is contained in:
parent
410d0bc125
commit
fcb6198a82
15
.github/workflows/dockerhub.yml
vendored
15
.github/workflows/dockerhub.yml
vendored
@ -3,8 +3,7 @@ name: Build DockerHub
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- dev
|
||||
- '*'
|
||||
tags:
|
||||
- '*'
|
||||
|
||||
@ -28,22 +27,20 @@ jobs:
|
||||
DOCKER_IMAGE=neilpang/acme.sh
|
||||
|
||||
if [[ $GITHUB_REF == refs/tags/* ]]; then
|
||||
BRANCH_TAG=${GITHUB_REF#refs/tags/}
|
||||
AUTO_UPGRADE=1
|
||||
DOCKER_IMAGE_TAG=${GITHUB_REF#refs/tags/}
|
||||
fi
|
||||
|
||||
if [[ $GITHUB_REF == refs/heads/* ]]; then
|
||||
BRANCH_TAG=${GITHUB_REF#refs/heads/}
|
||||
DOCKER_IMAGE_TAG=${GITHUB_REF#refs/heads/}
|
||||
|
||||
if [[ $BRANCH_TAG == master ]]; then
|
||||
BRANCH_TAG=latest
|
||||
if [[ $DOCKER_IMAGE_TAG == master ]]; then
|
||||
DOCKER_IMAGE_TAG=latest
|
||||
AUTO_UPGRADE=1
|
||||
fi
|
||||
fi
|
||||
|
||||
docker buildx build \
|
||||
--tag ${DOCKER_IMAGE}:${BRANCH_TAG} \
|
||||
--tag ${DOCKER_IMAGE}:${GITHUB_SHA} \
|
||||
--tag ${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG} \
|
||||
--output "type=image,push=true" \
|
||||
--build-arg AUTO_UPGRADE=${AUTO_UPGRADE} \
|
||||
--platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/386 .
|
||||
|
@ -15,7 +15,7 @@ RUN apk update -f \
|
||||
|
||||
ENV LE_CONFIG_HOME /acme.sh
|
||||
|
||||
ENV AUTO_UPGRADE 1
|
||||
ARG AUTO_UPGRADE=1
|
||||
|
||||
#Install
|
||||
ADD ./ /install_acme.sh/
|
||||
|
Loading…
Reference in New Issue
Block a user