Development Docker updates (#443)

Author: daveearley

backend/Dockerfile.dev

@@ -1,21 +1,19 @@
-FROM webdevops/php-nginx:8.2-alpine
+FROM serversideup/php:8.3-fpm-nginx-alpine
 
-WORKDIR /app
+ENV PHP_OPCACHE_ENABLE=1
+ENV NGINX_WEBROOT=/var/www/html/public
 
-COPY . /app
+WORKDIR /var/www/html
 
-ENV WEB_DOCUMENT_ROOT /app/public
+RUN mkdir -p /var/www/html/storage /var/www/html/bootstrap/cache \
+    && chown -R www-data:www-data /var/www/html
 
-ENV PHP_DISMOD=ioncube,pdo_sqlsrv,sqlsrv,pdo_mysql,mysqli,mysqlnd,pdo_sqlite,mysqlnd,mongodb,memcached
+COPY --chown=www-data:www-data . /var/www/html
 
-COPY ./docker/supervisord/syslog.conf /opt/docker/etc/supervisor.d/syslog.conf
+# Switch to root user to install PHP extensions
+USER root
+RUN install-php-extensions intl
+USER www-data
 
-RUN chown -R application:application /app \
-    && mkdir -p /app/storage \
-    && chmod -R 755 /app/storage  \
-    && mkdir -p /app/bootstrap/cache \
-    && chmod -R 775 /app/bootstrap/cache
-
-EXPOSE 80 443
-
-CMD ["supervisord"]
+RUN chmod -R 755 /var/www/html/storage \
+    && chmod -R 775 /var/www/html/bootstrap/cache

docker/development/.env

@@ -4,7 +4,7 @@ APP_KEY=base64:z7qfYEwsFdTn6zMCYwgSwDoWZlk6SuKU54+woXYNHlk=
 APP_DEBUG=true
 
 API_URL_CLIENT=https://localhost:8443/api
-API_URL_SERVER=http://backend:80
+API_URL_SERVER=http://backend:8080
 STRIPE_PUBLIC_KEY=pk_test_XX
 FRONTEND_URL=https://localhost:8443
 

docker/development/docker-compose.dev.yml

@@ -7,9 +7,9 @@ services:
         ports:
             - "1234:80"
         volumes:
-            - ./../../backend:/app
-            - ./../../backend/storage:/app/storage
-            - ./../../backend/bootstrap/cache:/app/bootstrap/cache
+            - ./../../backend:/var/www/html
+            - ./../../backend/storage:/var/www/html/storage
+            - ./../../backend/bootstrap/cache:/var/www/html/bootstrap/cache
         environment:
               APP_ENV: '${APP_ENV:-local}'
               APP_KEY: '${APP_KEY}'

docker/development/nginx/nginx.conf

@@ -20,7 +20,7 @@ http {
         }
 
         location /api/ {
-            proxy_pass http://backend:80/;
+            proxy_pass http://backend:8080/;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

docker/development/start-dev.sh

@@ -85,7 +85,7 @@ fi
 
 $COMPOSE_CMD exec backend php artisan key:generate
 $COMPOSE_CMD exec backend php artisan migrate
-$COMPOSE_CMD exec backend chmod -R 775 /app/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer
+$COMPOSE_CMD exec backend chmod -R 775 /var/www/html/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer
 $COMPOSE_CMD exec backend php artisan storage:link
 
 if [ $? -ne 0 ]; then