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

Fix chown in v4 (#348)

Browse Source
This commit is contained in:
Ween Jiann
2021-05-14 09:45:32 +08:00
committed by GitHub
parent e34ac95617
commit 13423d38c0
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@@ -17,15 +17,15 @@ VERSION=$(shell echo ${TAG} | sed "s/-.*//")
# Building docker images based on alpine. # Building docker images based on alpine.
# Assigned tags: # Assigned tags:
# - :alpine # - :4
# - :alpine-<RELEASE VERSION> # - :<RELEASE VERSION>
.PHONY: build-alpine .PHONY: build-alpine
build-alpine: build-alpine:
ifeq ($(IS_V5),) ifeq ($(IS_V5),)
$(info Make: Building "$(VERSION)" tagged images from alpine.) $(info Make: Building "$(VERSION)" tagged images from alpine.)
@docker build -t ${HUB_NAMESPACE}/${IMAGE}:alpine-${VERSION} --build-arg INVOICENINJA_VERSION=${VERSION} ./alpine/4/ @docker build -t ${HUB_NAMESPACE}/${IMAGE}:${VERSION} --build-arg INVOICENINJA_VERSION=${VERSION} ./alpine/4/
# Tag as alpine-4 # Tag as 4
@docker tag ${HUB_NAMESPACE}/${IMAGE}:alpine-${VERSION} ${HUB_NAMESPACE}/${IMAGE}:alpine-4 @docker tag ${HUB_NAMESPACE}/${IMAGE}:alpine-${VERSION} ${HUB_NAMESPACE}/${IMAGE}:4
$(info Make: Done.) $(info Make: Done.)
endif endif
@@ -33,8 +33,8 @@ 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-${VERSION} @docker push ${HUB_NAMESPACE}/${IMAGE}:${VERSION}
@docker push ${HUB_NAMESPACE}/${IMAGE}:alpine-4 @docker push ${HUB_NAMESPACE}/${IMAGE}:4
$(info Make: Done.) $(info Make: Done.)
endif endif

2
alpine/4/rootfs/usr/local/bin/docker-entrypoint
View File

@@ -83,7 +83,7 @@ fi
rm -rf "$BAK_PUBLIC_PATH" rm -rf "$BAK_PUBLIC_PATH"
# Set permission for web server to create/update files (only <v4) # Set permission for web server to create/update files (only <v4)
chown -R "$INVOICENINJA_USER":www-data /var/www/app/storage /var/www/app/public /var/www/app/bootstrap chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" /var/www/app/storage /var/www/app/public /var/www/app/bootstrap
# Initialize values that might be stored in a file # Initialize values that might be stored in a file
file_env 'APP_KEY' file_env 'APP_KEY'