This commit is contained in:
Rodolfo Berrios
2022-04-03 16:09:16 -04:00
parent b0fdb04eb5
commit c230d09009
2 changed files with 14 additions and 19 deletions

View File

@@ -7,11 +7,11 @@ CONTAINER_BASENAME ?= chevereto-build-${VERSION}
TAG ?= 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
NAMESPACE ?= local
VERSION_DOTLESS = $(shell echo \${VERSION} | tr -d '.')
LICENSE ?= $(shell stty -echo; read -p "Chevereto V4 License key: " license; stty echo; echo $$license)
# Echo doing
FEEDBACK = $(shell echo 👉 V\${VERSION} \${NAMESPACE} [PHP \${PHP}] \(\${DOCKER_USER}\))
FEEDBACK_SHORT = $(shell echo 👉 V\${VERSION} [PHP \${PHP}] \(\${DOCKER_USER}\))
@@ -75,7 +75,6 @@ up--d: arguments
stop: arguments
@CONTAINER_BASENAME=${CONTAINER_BASENAME} \
PORT=${PORT} \
TAG=${TAG} \
VERSION=${VERSION} \
docker compose \
-p ${PROJECT} \
@@ -85,7 +84,6 @@ stop: arguments
down: arguments
@CONTAINER_BASENAME=${CONTAINER_BASENAME} \
PORT=${PORT} \
TAG=${TAG} \
VERSION=${VERSION} \
docker compose \
-p ${PROJECT} \
@@ -95,7 +93,6 @@ down: arguments
down--volumes: arguments
@CONTAINER_BASENAME=${CONTAINER_BASENAME} \
PORT=${PORT} \
TAG=${TAG} \
VERSION=${VERSION} \
docker compose \
-p ${PROJECT} \

View File

@@ -557,17 +557,15 @@ LoadModule rewrite_module modules/mod_rewrite.so
<IfModule dir_module>
DirectoryIndex index.html index.php
</IfModule>
<VirtualHost *:80>
<Directory /var/www/html>
Options Indexes FollowSymLinks
AllowOverride All
Require all granted
</Directory>
<FilesMatch \.php$>
SetHandler "proxy:fcgi://php:9000/"
</FilesMatch>
ServerAdmin webmaster@localhost
DocumentRoot /var/www/html
ErrorLog /proc/self/fd/2
CustomLog /proc/self/fd/1 common
</VirtualHost>
<Directory /var/www/html>
Options Indexes FollowSymLinks
AllowOverride All
Require all granted
</Directory>
<FilesMatch \.php$>
SetHandler "proxy:fcgi://php:9000/"
</FilesMatch>
ServerAdmin webmaster@localhost
DocumentRoot /var/www/html
ErrorLog /proc/self/fd/2
CustomLog /proc/self/fd/1 common