From 57a6154287f9235e1288f9e8a322aee6584bc396 Mon Sep 17 00:00:00 2001
From: zeke <sfpj5l17y@mozmail.com>
Date: Sun, 4 Feb 2024 23:34:17 -0800
Subject: [PATCH] Update script with php/web container differences

---
 docker/common-setup.sh  | 20 ++++++++++++++------
 docker/nginx/Dockerfile |  2 +-
 docker/php/Dockerfile   |  7 ++++---
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/docker/common-setup.sh b/docker/common-setup.sh
index c7ea147e..e4373971 100755
--- a/docker/common-setup.sh
+++ b/docker/common-setup.sh
@@ -1,10 +1,12 @@
 #!/bin/sh
 
 # not exactly elegant, but one container is Debian, the other is Alpine
-useradd -MU leftypol
-addgroup leftypol
-adduser -DHG leftypol leftypol
-
+if [ "$1" == "php" ]; then
+   useradd -MU leftypol
+else
+   addgroup leftypol
+   adduser -DHG leftypol leftypol
+fi
 set -eu
 
 install -m 775 -o leftypol -g leftypol -d /var/www-leftypol
@@ -21,8 +23,8 @@ ln -s \
    /code/install.sql \
    /var/www-leftypol/
 
-install -m 775 -o leftypol -g leftypol -d /var/www/js
-ln -s /code/js/* /var/www/js/
+install -m 775 -o leftypol -g leftypol -d /var/www-leftypol/js
+ln -s /code/js/* /var/www-leftypol/js/
 
 install -m 775 -o leftypol -g leftypol -d /var/www-leftypol/templates
 install -m 775 -o leftypol -g leftypol -d /var/www-leftypol/templates/cache
@@ -30,3 +32,9 @@ ln -s /code/templates/* /var/www-leftypol/templates/
 
 install -m 775 -o leftypol -g leftypol -d /var/www-leftypol/inc
 ln -s /code/inc/* /var/www-leftypol/inc/
+
+if [ "$1" = "php" ]; then
+   ln -s /code/composer.json /code/composer.lock /var/www-leftypol/ \
+   cd /var/www
+   composer install
+fi
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
index 9c2392b2..1f3333b3 100644
--- a/docker/nginx/Dockerfile
+++ b/docker/nginx/Dockerfile
@@ -1,7 +1,7 @@
 FROM nginx:1.25.3-alpine
 
 COPY . /code
-RUN /code/docker/common-setup.sh
+RUN /code/docker/common-setup.sh web
 
 
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index 2db11415..c1292d1e 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -35,10 +35,11 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
     && pecl install imagick \
     && pecl install -o -f igbinary \
     && docker-php-ext-install gd zip opcache intl pdo pdo_mysql mysqli bcmath gettext iconv mbstring curl \
-    && docker-php-ext-enable igbinary redis imagick
+    && docker-php-ext-enable igbinary redis imagick \
+    && /code/docker/common-setup.sh \
+    && cd /var/www-leftypol && composer install
 
-
-RUN /code/docker/common-setup.sh
+# RUN /code/docker/common-setup.sh php
 WORKDIR "/var/www-leftypol"
 CMD ["php-fpm"]
 EXPOSE 9000
\ No newline at end of file