mirror of
https://github.com/chevereto/docker.git
synced 2025-12-24 00:49:43 +01:00
dummy certs
This commit is contained in:
4
Makefile
4
Makefile
@@ -13,6 +13,8 @@ PORT_HTTP ?= 8420
|
|||||||
PORT_HTTPS ?= 8430
|
PORT_HTTPS ?= 8430
|
||||||
PORT = $(shell [[ \${PROTOCOL} == "http" ]] && echo \${PORT_HTTP} || echo \${PORT_HTTPS})
|
PORT = $(shell [[ \${PROTOCOL} == "http" ]] && echo \${PORT_HTTP} || echo \${PORT_HTTPS})
|
||||||
HTTPS = $(shell [[ \${PROTOCOL} == "http" ]] && echo 0 || echo 1)
|
HTTPS = $(shell [[ \${PROTOCOL} == "http" ]] && echo 0 || echo 1)
|
||||||
|
HTTPS_CERT = $(shell [[ -f "https/cert.pem" ]] && echo || echo dummy/)cert.pem
|
||||||
|
HTTPS_KEY = $(shell [[ -f "https/key.pem" ]] && echo || echo dummy/)key.pem
|
||||||
|
|
||||||
URL = ${PROTOCOL}://${HOSTNAME}:${PORT}/
|
URL = ${PROTOCOL}://${HOSTNAME}:${PORT}/
|
||||||
PROJECT = $(shell [[ \${TARGET} == "prod" ]] && echo \${NAMESPACE}_chevereto || echo \${NAMESPACE}_chevereto-${TARGET})
|
PROJECT = $(shell [[ \${TARGET} == "prod" ]] && echo \${NAMESPACE}_chevereto || echo \${NAMESPACE}_chevereto-${TARGET})
|
||||||
@@ -32,6 +34,8 @@ LICENSE ?= $(shell stty -echo; read -p "Chevereto V4 License key: 🔑" license;
|
|||||||
DOCKER_COMPOSE = $(shell echo @CONTAINER_BASENAME=\${CONTAINER_BASENAME} \
|
DOCKER_COMPOSE = $(shell echo @CONTAINER_BASENAME=\${CONTAINER_BASENAME} \
|
||||||
PORT_HTTP=\${PORT_HTTP} \
|
PORT_HTTP=\${PORT_HTTP} \
|
||||||
PORT_HTTPS=\${PORT_HTTPS} \
|
PORT_HTTPS=\${PORT_HTTPS} \
|
||||||
|
HTTPS_CERT=\${HTTPS_CERT} \
|
||||||
|
HTTPS_KEY=\${HTTPS_KEY} \
|
||||||
HTTPS=\${HTTPS} \
|
HTTPS=\${HTTPS} \
|
||||||
TAG_BASENAME=\${TAG_BASENAME} \
|
TAG_BASENAME=\${TAG_BASENAME} \
|
||||||
VERSION=\${VERSION} \
|
VERSION=\${VERSION} \
|
||||||
|
|||||||
@@ -41,10 +41,10 @@ services:
|
|||||||
- storage:/var/www/html/images/
|
- storage:/var/www/html/images/
|
||||||
- assets:/var/www/html/_assets/
|
- assets:/var/www/html/_assets/
|
||||||
- type: bind
|
- type: bind
|
||||||
source: ${PWD}/https/cert.pem
|
source: ${PWD}/https/${HTTPS_CERT}
|
||||||
target: /etc/ssl/certs/cert.pem
|
target: /etc/ssl/certs/cert.pem
|
||||||
- type: bind
|
- type: bind
|
||||||
source: ${PWD}/https/key.pem
|
source: ${PWD}/https/${HTTPS_KEY}
|
||||||
target: /etc/ssl/private/key.pem
|
target: /etc/ssl/private/key.pem
|
||||||
ports:
|
ports:
|
||||||
- ${PORT_HTTP}:80
|
- ${PORT_HTTP}:80
|
||||||
|
|||||||
Reference in New Issue
Block a user