Updated Composefile to use FrankenPHP-based image

Author: pmaene

.github/workflows/php.yml

@@ -38,7 +38,7 @@ jobs:
         run: docker-compose up -d
 
       - name: Initialise Litus
-        run: docker-compose run --rm php-cli init
+        run: docker-compose run --rm litus init
 
       - name: Test response
         run: curl -fsSL -I --retry 5 --retry-delay 0 --retry-max-time 30 http://localhost:8080

Dockerfile

@@ -52,10 +52,6 @@ ENV APPLICATION_ENV=${APPLICATION_ENV}
 ARG COMMIT_SHA
 ENV COMMIT_SHA=${COMMIT_SHA}
 
-RUN mv "${PHP_INI_DIR}/php.ini-production" "${PHP_INI_DIR}/php.ini"
-
-COPY docker/frankenphp/litus.ini /usr/local/etc/php/conf.d/
-
 RUN install-php-extensions \
   imagick \
   intl \
@@ -78,6 +74,8 @@ RUN curl -fsSL -o /tmp/fop-2.7-bin.tar.gz https://downloads.apache.org/xmlgraphi
   tar --strip-components=1 -C /opt -xzf /tmp/fop-2.7-bin.tar.gz fop-2.7/fop && \
   rm /tmp/fop-2.7-bin.tar.gz
 
+RUN mv "${PHP_INI_DIR}/php.ini-production" "${PHP_INI_DIR}/php.ini"
+
 RUN mkdir -p /app/public/_assetic && \
   mkdir -p /app/public/_common/profile && \
   mkdir -p /app/public/_gallery/albums && \
@@ -88,6 +86,9 @@ RUN mkdir -p /app/public/_assetic && \
 
 COPY --from=composer /app/ /app/
 
+COPY docker/frankenphp/litus.ini /usr/local/etc/php/conf.d/
+COPY docker/frankenphp/entrypoint.sh /
+
 VOLUME ["/app/public/_assetic"]
 VOLUME ["/app/public/_common/profile"]
 VOLUME ["/app/public/_gallery/albums"]
@@ -96,3 +97,5 @@ VOLUME ["/app/public/_publications/html"]
 VOLUME ["/app/public/_br/img"]
 
 VOLUME ["/data"]
+
+ENTRYPOINT ["/entrypoint.sh"]

docker-compose.yml

@@ -10,60 +10,10 @@ volumes:
 services:
   litus:
     image: litusproject/litus:latest
-    container_name: litus-litus-1
     build:
       context: .
-    depends_on:
-      - php-fpm
     ports:
-      - 127.0.0.1:8080:8080
-    volumes:
-      - assetic:/app/public/_assetic
-    restart: unless-stopped
-
-  pgweb:
-    image: sosedoff/pgweb:latest
-    container_name: litus-pgweb-1
-    depends_on:
-      - postgres
-    environment:
-      - DATABASE_URL=postgres://litus:huQeyU8te3aXusaz@postgres:5432/litus?sslmode=disable
-    ports:
-      - 127.0.0.1:8081:8081
-    restart: unless-stopped
-
-  php-cli:
-    image: litusproject/litus:php-cli-latest
-    build:
-      context: .
-      target: php-cli
-    depends_on:
-      - postgres
-      - redis
-    environment:
-      LITUS_DATABASE_HOST: postgres
-      LITUS_DATABASE_USER: litus
-      LITUS_DATABASE_PASSWORD: huQeyU8te3aXusaz
-      LITUS_DATABASE_DBNAME: litus
-
-      LITUS_REDIS_HOST: redis
-
-  php-fpm:
-    image: litusproject/litus:php-fpm-latest
-    container_name: litus-php-fpm-1
-    build:
-      context: .
-      target: php-fpm
-    depends_on:
-      - postgres
-      - redis
-    environment:
-      LITUS_DATABASE_HOST: postgres
-      LITUS_DATABASE_USER: litus
-      LITUS_DATABASE_PASSWORD: huQeyU8te3aXusaz
-      LITUS_DATABASE_DBNAME: litus
-
-      LITUS_REDIS_HOST: redis
+      - 127.0.0.1:8080:80
     volumes:
       - assetic:/app/public/_assetic
     restart: unless-stopped

docker/caddy/Caddyfile

@@ -19,7 +19,7 @@ case "$1" in
         ;;
 
     "")
-        exit 0
+        docker-php-entrypoint --config /etc/Caddyfile
         ;;
 
     *)