diff --git a/Makefile b/Makefile index bf5254d..2cd794d 100644 --- a/Makefile +++ b/Makefile @@ -3,20 +3,20 @@ VERSION ?= 4.0 PHP ?= 8.1 DOCKER_USER ?= www-data PROTOCOL ?= http -CONTAINER_BASENAME ?= chevereto-build-${VERSION} +# NAMESPACE prefix in project's name +NAMESPACE ?= local +# Project's name +PROJECT = ${NAMESPACE}_chevereto-build +CONTAINER_BASENAME ?= ${NAMESPACE}_chevereto-build-${VERSION} TAG_BASENAME ?= chevereto-build:${VERSION}-${NAMESPACE} # SERVICE php|database|http SERVICE ?= php LICENSE ?= $(shell stty -echo; read -p "Chevereto V4 License key: " license; stty echo; echo $$license) PORT ?= 8040 -# NAMESPACE prefix in project's name -NAMESPACE ?= local VERSION_DOTLESS = $(shell echo \${VERSION} | tr -d '.') # Echo doing FEEDBACK = $(shell echo 👉 V\${VERSION} \${NAMESPACE} [PHP \${PHP}] \(\${DOCKER_USER}\)) FEEDBACK_SHORT = $(shell echo 👉 V\${VERSION} [PHP \${PHP}] \(\${DOCKER_USER}\)) -# Project's name -PROJECT = ${NAMESPACE}-chevereto-build arguments: @echo "${FEEDBACK}" @@ -82,7 +82,7 @@ up: arguments -f projects/prod.yml \ up -up--d: arguments +up-d: arguments @CONTAINER_BASENAME=${CONTAINER_BASENAME} \ PORT=${PORT} \ TAG_BASENAME=${TAG_BASENAME} \ diff --git a/README.md b/README.md index 9d88565..b96df01 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ make image ``` ```sh -make up--d +make up-d ``` ## Documentation diff --git a/docs/DOCKER-COMPOSE.md b/docs/DOCKER-COMPOSE.md index 785bb8d..d41709a 100644 --- a/docs/DOCKER-COMPOSE.md +++ b/docs/DOCKER-COMPOSE.md @@ -21,7 +21,7 @@ make up ## Up (daemon) ```sh -make up--d +make up-d ``` ## Stop diff --git a/php.Dockerfile b/php.Dockerfile index 715edd4..8c5d5d1 100644 --- a/php.Dockerfile +++ b/php.Dockerfile @@ -82,10 +82,10 @@ RUN set -eux; \ WORKDIR /var/www/html -RUN mkdir -p ./_assets ./images \ - ./importing/no-parse \ - ./importing/parse-albums \ - ./importing/parse-users +RUN mkdir -p _assets images \ + importing/no-parse \ + importing/parse-albums \ + importing/parse-users RUN chown www-data: . -R && ls -la