From 8a96b8382628f3d54d7b8dcfeb97639f0cb9c3e0 Mon Sep 17 00:00:00 2001 From: Rodolfo Berrios <20590102+rodber@users.noreply.github.com> Date: Mon, 17 Oct 2022 14:37:05 -0300 Subject: [PATCH] try linux --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index e7f1a30..c84df74 100644 --- a/Makefile +++ b/Makefile @@ -11,20 +11,20 @@ SERVICE ?= php PORT_HTTP ?= 8420 PORT_HTTPS ?= 8430 -PORT = $(shell [[ \${PROTOCOL} == "http" ]] && echo \${PORT_HTTP} || echo \${PORT_HTTPS}) -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 +PORT = $(shell [ \${PROTOCOL} == "http" ] && echo \${PORT_HTTP} || echo \${PORT_HTTPS}) +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}/ -PROJECT = $(shell [[ \${TARGET} == "prod" ]] && echo \${NAMESPACE}_chevereto || echo \${NAMESPACE}_chevereto-${TARGET}) +PROJECT = $(shell [ \${TARGET} == "prod" ] && echo \${NAMESPACE}_chevereto || echo \${NAMESPACE}_chevereto-${TARGET}) CONTAINER_BASENAME ?= ${NAMESPACE}_chevereto-${VERSION} TAG_BASENAME ?= ${NAMESPACE}_chevereto:${VERSION} COMPOSE ?= docker-compose PROJECT_COMPOSE = ${COMPOSE}.yml COMPOSE_SAMPLE = default.yml -COMPOSE_FILE = $(shell [[ -f \${PROJECT_COMPOSE} ]] && echo \${PROJECT_COMPOSE} || echo \${COMPOSE_SAMPLE}) +COMPOSE_FILE = $(shell [ -f \${PROJECT_COMPOSE} ] && echo \${PROJECT_COMPOSE} || echo \${COMPOSE_SAMPLE}) FEEDBACK = $(shell echo 👉 \${TARGET} V\${VERSION} \${NAMESPACE} [PHP \${PHP}] \(\${DOCKER_USER}\)) FEEDBACK_SHORT = $(shell echo 👉 \${TARGET} V\${VERSION} [PHP \${PHP}] \(\${DOCKER_USER}\)) @@ -124,7 +124,7 @@ down: feedback feedback--compose down--volumes: feedback feedback--compose ${DOCKER_COMPOSE} down --volumes -# tools +# https certbot: @echo "🔐 Generating certificate"