From e020ca2b7df05a299b09533b66d50980c828bda3 Mon Sep 17 00:00:00 2001
From: Badanin Maksim <iot@ya.ru>
Date: Tue, 26 Mar 2024 21:39:52 +0300
Subject: [PATCH] =?UTF-8?q?=D1=83=D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=81=D1=85=D0=B5=D0=BC=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env               | 4 +---
 Dockerfile         | 9 ++++-----
 docker-compose.yml | 6 ++----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.env b/.env
index c8119eb..f259bbe 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,3 @@
 NPM_IMAGE=jc21/nginx-proxy-manager
 NPM_VERSION=2.11.1
-NPM_HOSTNAME=<CHANGE> #npm
-DOMAIN_NAME=<CHANGE> #example.com
-CA_HOSTNAME=<CHANGE> #ca
+STEP_CA_FQDN=ca.example.com
diff --git a/Dockerfile b/Dockerfile
index a804780..153d487 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,10 +3,9 @@ ARG NPM_VERSION
 
 FROM $NPM_IMAGE:$NPM_VERSION
 
-ARG DOMAIN_NAME  
-ARG CA_HOSTNAME
-ENV CA_FQDN=${CA_HOSTNAME}.${DOMAIN_NAME}
+ARG STEP_CA_FQDN  
+ENV STEP_CA_FQDN=${STEP_CA_FQDN}
 
-RUN echo -e "server=https://$CA_FQDN/acme/acme/directory\nno-verify-ssl = true" >> /etc/letsencrypt.ini
+RUN echo -e "server=https://$STEP_CA_FQDN/acme/acme/directory\nno-verify-ssl = true" >> /etc/letsencrypt.ini
 
-RUN sed -i "s\Let's Encrypt\\$CA_FQDN\g" /app/frontend/js/*.js
+RUN sed -i "s\Let's Encrypt\\$STEP_CA_FQDN\g" /app/frontend/js/*.js
diff --git a/docker-compose.yml b/docker-compose.yml
index f243626..ef28ea4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,18 +1,16 @@
 version: '3.8'
+
 services:
   npm:
     image: '${NPM_IMAGE}-step-ca:${NPM_VERSION}'
     container_name: npm
-    hostname: ${NPM_HOSTNAME}.${DOMAIN_NAME}
     restart: unless-stopped
     build:
       context: ./
       args:
         NPM_IMAGE: ${NPM_IMAGE}
         NPM_VERSION: ${NPM_VERSION}
-        NPM_HOSTNAME: ${NPM_HOSTNAME}
-        DOMAIN_NAME: ${DOMAIN_NAME}
-        CA_HOSTNAME: ${CA_HOSTNAME}
+        STEP_CA_FQDN: ${STEP_CA_FQDN}
     ports:
       - '80:80'
       - '443:443'