Dockerfiles updated and added jenkinsfile

.dockerignore

@@ -0,0 +1 @@
+docker/data/*

docker-compose.yml

@@ -8,10 +8,8 @@ services:
       dockerfile: ./docker/php/php.dockerfile
       target: development
       args:
-        USER_ID: ${UID:-1000}
-        GROUP_ID: ${GID:-1000}
-    volumes:
-      - .:/var/www/html
+        USER_ID: ${UID:-1004}
+        GROUP_ID: ${GID:-1004}
     networks:
       - sapience
     extra_hosts:
@@ -38,7 +36,6 @@ services:
     image: mariadb:lts
     restart: unless-stopped
     tty: true
-    user: root
     ports:
       - ${DB_EXTERNAL_PORT:-3307}:3306
     volumes:
@@ -132,7 +129,7 @@ services:
     image: typesense/typesense:29.0
     restart: unless-stopped
     ports:
-      - ${TYPESENSE_PORT:-8108}:8108
+      - 8110:8108
     volumes:
       - ./docker/data/typesense:/data
     command: '--data-dir /data --api-key=${TYPESENSE_API_KEY:-xyz} --enable-cors'
@@ -151,4 +148,3 @@ services:
       TYPESENSE_API_KEY: ${TYPESENSE_API_KEY:-xyz}
     depends_on:
       - typesense
-

docker/php/php.dockerfile

@@ -11,9 +11,11 @@ FROM base AS development
 # Switch to root so we can do root things
 USER root
 
-# Install Poppler utilities
+# Install Poppler utilities and Node.js
 RUN apt-get update && \
     apt-get install -y --no-install-recommends poppler-utils && \
+    curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \
+    apt-get install -y nodejs && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -32,6 +34,17 @@ RUN docker-php-serversideup-set-id www-data $USER_ID:$GROUP_ID && \
     # Update the file permissions for our NGINX service to match the new UID/GID
     docker-php-serversideup-set-file-permissions --owner $USER_ID:$GROUP_ID --service nginx
 
+WORKDIR /var/www/html
+
+# Copy our app files as www-data (33:33)
+COPY --chown=www-data:www-data . /var/www/html
+
+RUN composer install
+
+RUN npm install
+
+RUN chown -R www-data:www-data /var/www/html
+
 # Drop back to our unprivileged user
 USER www-data
 
@@ -47,11 +60,21 @@ USER root
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends poppler-utils && \
+    curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \
+    apt-get install -y nodejs && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-# Drop back to our unprivileged user
-USER www-data
+WORKDIR /var/www/html
 
 # Copy our app files as www-data (33:33)
 COPY --chown=www-data:www-data . /var/www/html
+
+RUN composer install
+
+RUN npm install
+
+RUN chown -R www-data:www-data /var/www/html
+
+# Drop back to our unprivileged user
+USER www-data