wululu_web/invoiceninja-docker
3
0
Fork 0
mirror of https://github.com/invoiceninja/dockerfiles.git synced 2025-12-31 19:47:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:codedge/dockerfiles

Browse Source
This commit is contained in:
Holger Lösken
2020-08-17 07:42:25 +02:00
parent 78b5e59cd5 d87e5948bf
commit 5942c1c362
4 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@@ -11,6 +11,9 @@ IMAGE="invoiceninja"
# Check if v5 tag is passed, so that a v5 version should be built # Check if v5 tag is passed, so that a v5 version should be built
IS_V5=$(shell echo ${TAG} | egrep ^5) IS_V5=$(shell echo ${TAG} | egrep ^5)
# Version of Invoice Ninja. As the tag can be something like 5.0.4-p1, the version is 5.0.4.
# This supports changes to the Dockerfiles with always the same Invoice Ninja version
VERSION=$(shell echo ${TAG} | sed "s/-.*//")
# Building docker images based on alpine. # Building docker images based on alpine.
# Assigned tags: # Assigned tags:
@@ -19,10 +22,10 @@ IS_V5=$(shell echo ${TAG} | egrep ^5)
.PHONY: build-alpine .PHONY: build-alpine
build-alpine: build-alpine:
ifeq ($(IS_V5),) ifeq ($(IS_V5),)
$(info Make: Building "$(TAG)" tagged images from alpine.) $(info Make: Building "$(VERSION)" tagged images from alpine.)
@docker build -t ${HUB_NAMESPACE}/${IMAGE}:alpine-${TAG} --build-arg INVOICENINJA_VERSION=${TAG} --file ./alpine/Dockerfile . @docker build -t ${HUB_NAMESPACE}/${IMAGE}:alpine-${VERSION} --build-arg INVOICENINJA_VERSION=${VERSION} --file ./alpine/Dockerfile .
# Tag as alpine-4 # Tag as alpine-4
@docker tag ${HUB_NAMESPACE}/${IMAGE}:alpine-${TAG} ${HUB_NAMESPACE}/${IMAGE}:alpine-4 @docker tag ${HUB_NAMESPACE}/${IMAGE}:alpine-${VERSION} ${HUB_NAMESPACE}/${IMAGE}:alpine-4
$(info Make: Done.) $(info Make: Done.)
endif endif
@@ -30,7 +33,7 @@ endif
push-alpine: push-alpine:
ifeq ($(IS_V5),) ifeq ($(IS_V5),)
$(info Make: Pushing tagged images from alpine.) $(info Make: Pushing tagged images from alpine.)
@docker push ${HUB_NAMESPACE}/${IMAGE}:alpine-${TAG} @docker push ${HUB_NAMESPACE}/${IMAGE}:alpine-${VERSION}
@docker push ${HUB_NAMESPACE}/${IMAGE}:alpine-4 @docker push ${HUB_NAMESPACE}/${IMAGE}:alpine-4
$(info Make: Done.) $(info Make: Done.)
endif endif
@@ -38,10 +41,10 @@ endif
.PHONY: build-alpine-v5 .PHONY: build-alpine-v5
build-alpine-v5: build-alpine-v5:
ifneq ($(IS_V5),) ifneq ($(IS_V5),)
$(info Make: Building "$(TAG)" tagged images from alpine.) $(info Make: Building "$(VERSION)" tagged images from alpine.)
@docker build -t ${HUB_NAMESPACE}/${IMAGE}:${TAG} --build-arg INVOICENINJA_VERSION=${TAG} --file ./alpine/Dockerfile_v5 . @docker build -t ${HUB_NAMESPACE}/${IMAGE}:${VERSION} --build-arg INVOICENINJA_VERSION=${VERSION} --file ./alpine/Dockerfile_v5 .
@docker tag ${HUB_NAMESPACE}/${IMAGE}:${TAG} ${HUB_NAMESPACE}/${IMAGE}:5 @docker tag ${HUB_NAMESPACE}/${IMAGE}:${VERSION} ${HUB_NAMESPACE}/${IMAGE}:5
@docker tag ${HUB_NAMESPACE}/${IMAGE}:${TAG} ${HUB_NAMESPACE}/${IMAGE}:latest @docker tag ${HUB_NAMESPACE}/${IMAGE}:${VERSION} ${HUB_NAMESPACE}/${IMAGE}:latest
$(info Make: Done.) $(info Make: Done.)
endif endif
@@ -49,7 +52,7 @@ endif
push-alpine-v5: push-alpine-v5:
ifneq ($(IS_V5),) ifneq ($(IS_V5),)
$(info Make: Pushing tagged images from alpine.) $(info Make: Pushing tagged images from alpine.)
@docker push ${HUB_NAMESPACE}/${IMAGE}:${TAG} @docker push ${HUB_NAMESPACE}/${IMAGE}:${VERSION}
@docker push ${HUB_NAMESPACE}/${IMAGE}:5 @docker push ${HUB_NAMESPACE}/${IMAGE}:5
@docker push ${HUB_NAMESPACE}/${IMAGE}:latest @docker push ${HUB_NAMESPACE}/${IMAGE}:latest
endif endif

4
alpine/Dockerfile_v5
View File

@@ -43,6 +43,8 @@ RUN chmod +x /usr/local/bin/docker-entrypoint
RUN set -eux; \ RUN set -eux; \
apk add --no-cache \ apk add --no-cache \
nodejs \
npm \
freetype-dev \ freetype-dev \
gmp-dev \ gmp-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
@@ -92,4 +94,4 @@ ENV APP_ENV production
ENV LOG errorlog ENV LOG errorlog
ENTRYPOINT ["docker-entrypoint"] ENTRYPOINT ["docker-entrypoint"]
CMD ["php-fpm"] CMD ["php-fpm"]

1
config/caddy/Caddyfile
View File

@@ -2,6 +2,5 @@
root * /var/www/app/public root * /var/www/app/public
php_fastcgi app:9000 php_fastcgi app:9000
encode zstd gzip encode zstd gzip
templates
file_server browse file_server browse
} }

13
entrypoint.sh
View File

@@ -12,16 +12,9 @@ in_error() {
exit 1 exit 1
} }
# Indirect expansion (ie) is not supported in bourne shell. That's why we are using this clunkiness here. # Indirect expansion (ie) is not supported in bourne shell. That's why we are using this "magic" here.
ie_gv() { ie_gv() {
local line name value eval "echo \$$1"
set | \
while read line; do
name=${line%=*} value=${line#*=\'}
if [ "$name" = "$1" ]; then
echo ${value%\'}
fi
done
} }
# usage: file_env VAR [DEFAULT] # usage: file_env VAR [DEFAULT]
@@ -37,7 +30,7 @@ file_env() {
in_error "Both $var and $fileVar are set (but are exclusive)" in_error "Both $var and $fileVar are set (but are exclusive)"
fi fi
local val="$def" local val="$def"
if [ "$(ie_gv ${var})" != "" ]; then if [ "$(ie_gv ${var})" != "" ]; then
val=$(ie_gv ${var}) val=$(ie_gv ${var})
elif [ "$(ie_gv ${fileVar})" != "" ]; then elif [ "$(ie_gv ${fileVar})" != "" ]; then