From ef5aa61a1110bd996ce273b45bd9b16b6636d080 Mon Sep 17 00:00:00 2001
From: Luke Berndt <luke@robotastic.com>
Date: Wed, 15 Nov 2023 10:22:40 -0500
Subject: [PATCH] fixed up

---
 account/Dockerfile  |  2 +-
 admin/Dockerfile    |  2 +-
 docker-compose.yml  |  4 ----
 frontend/Dockerfile |  2 +-
 init-letsencrypt.sh | 16 ++++++++--------
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/account/Dockerfile b/account/Dockerfile
index 46c492f..c7240ec 100644
--- a/account/Dockerfile
+++ b/account/Dockerfile
@@ -10,7 +10,7 @@ ARG REACT_APP_SITE_NAME
 ARG REACT_APP_ADMIN_EMAIL
 ARG NODE_ENV
 COPY package.json ./
-RUN npm install --also=dev
+RUN npm install --include=dev
 COPY . ./
 RUN npm run build
 RUN env
diff --git a/admin/Dockerfile b/admin/Dockerfile
index 070e663..d58dfbe 100644
--- a/admin/Dockerfile
+++ b/admin/Dockerfile
@@ -10,7 +10,7 @@ ARG REACT_APP_SITE_NAME
 ARG REACT_APP_ADMIN_EMAIL
 ARG NODE_ENV
 COPY package.json ./
-RUN npm install --also=dev
+RUN npm install --include=dev
 COPY . ./
 RUN npm run build
 
diff --git a/docker-compose.yml b/docker-compose.yml
index dccbcbb..4cf9bbc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -181,7 +181,3 @@ services:
       driver: syslog
       options:
         tag: "frontend"
-
-networks:
-  proxy:
-  node:
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 3ffe02a..f322db6 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -8,7 +8,7 @@ ARG REACT_APP_FRONTEND_SERVER
 ARG REACT_APP_GOOGLE_ANALYTICS
 ARG NODE_ENV
 COPY package.json ./
-RUN npm install --also=dev
+RUN npm install --include=dev
 COPY . ./
 RUN npm run build
 
diff --git a/init-letsencrypt.sh b/init-letsencrypt.sh
index 5bedb61..6ea9d96 100644
--- a/init-letsencrypt.sh
+++ b/init-letsencrypt.sh
@@ -10,12 +10,12 @@ fi
 
 # Rest of the script...
 
-if ! [ -x "$(command -v docker-compose)" ]; then
-  echo 'Error: docker-compose is not installed.' >&2
+if ! [ -x "$(command -v docker compose)" ]; then
+  echo 'Error: docker compose is not installed.' >&2
   exit 1
 fi
 
-domains=($REACT_APP_FRONTEND_SERVER, $REACT_APP_BACKEND_SERVER,  "https://socket.${DOMAIN_NAME}", $REACT_APP_ACCOUNT_SERVER, $REACT_APP_ADMIN_SERVER)
+domains=("$DOMAIN_NAME" "account.$DOMAIN_NAME" "admin.$DOMAIN_NAME" "api.$DOMAIN_NAME")
 
 rsa_key_size=4096
 data_path="./data/certbot"
@@ -41,7 +41,7 @@ fi
 echo "### Creating dummy certificate for $domains ..."
 path="/etc/letsencrypt/live/$domains"
 mkdir -p "$data_path/conf/live/$domains"
-docker-compose run --rm --entrypoint "\
+docker compose run --rm --entrypoint "\
   openssl req -x509 -nodes -newkey rsa:$rsa_key_size -days 1\
     -keyout '$path/privkey.pem' \
     -out '$path/fullchain.pem' \
@@ -50,11 +50,11 @@ echo
 
 
 echo "### Starting nginx ..."
-docker-compose up --force-recreate -d nginx
+docker compose up -d nginx
 echo
 
 echo "### Deleting dummy certificate for $domains ..."
-docker-compose run --rm --entrypoint "\
+docker compose run --rm --entrypoint "\
   rm -Rf /etc/letsencrypt/live/$domains && \
   rm -Rf /etc/letsencrypt/archive/$domains && \
   rm -Rf /etc/letsencrypt/renewal/$domains.conf" certbot
@@ -77,7 +77,7 @@ esac
 # Enable staging mode if needed
 if [ $staging != "0" ]; then staging_arg="--staging"; fi
 
-docker-compose run --rm --entrypoint "\
+docker compose run --rm --entrypoint "\
   certbot certonly --webroot -w /var/www/certbot \
     $staging_arg \
     $email_arg \
@@ -88,4 +88,4 @@ docker-compose run --rm --entrypoint "\
 echo
 
 echo "### Reloading nginx ..."
-docker-compose exec nginx nginx -s reload
\ No newline at end of file
+docker compose exec nginx nginx -s reload
\ No newline at end of file