nune/privatebin-docker-nginx-fpm-alpine
nune/privatebin-docker-nginx-fpm-alpine
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

stick to one convention

Browse source
This commit is contained in:
El RIDO 2021-07-14 21:32:17 +02:00
parent 75c1fc3603
commit 1a7ee4ca31
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -16,7 +16,7 @@ LABEL org.opencontainers.image.authors=support@privatebin.org \
RUN \
# Prepare composer dependencies
ALPINE_PACKAGES="$(echo ${ALPINE_PACKAGES} | sed 's/,/ /g')"
ALPINE_PACKAGES="$(echo ${ALPINE_PACKAGES} | sed 's/,/ /g')" ;\
ALPINE_COMPOSER_PACKAGES="" ;\
if [ -n "${COMPOSER_PACKAGES}" ] ; then \
ALPINE_COMPOSER_PACKAGES="php8 php8-curl php8-mbstring php8-phar" ;\

9
buildx.sh
View file

@ -46,15 +46,13 @@ is_image_push_required() {
main() {
local PUSH TAG IMAGE BUILD_ARGS
if [ "$EVENT" = schedule ]
then
if [ "$EVENT" = schedule ] ; then
TAG=nightly
else
TAG=${GITHUB_REF##*/}
fi
if is_image_push_required
then
if is_image_push_required ; then
PUSH=true
docker_login
else
@ -63,8 +61,7 @@ main() {
sed -e 's/^FROM alpine:.*$/FROM alpine:edge/' Dockerfile > Dockerfile.edge
image_build_arguments | while read -r IMAGE BUILD_ARGS
do
image_build_arguments | while read -r IMAGE BUILD_ARGS ; do
build_image $PUSH --tag "$IMAGE:latest" --tag "$IMAGE:$TAG" "$BUILD_ARGS"
build_image $PUSH -f Dockerfile.edge --tag "$IMAGE:edge" "$BUILD_ARGS"
done