Update the entrypoint and cmd for php images

jalendport · Jul 11, 2024 · 7deee9f · 7deee9f
1 parent 1b99185
commit 7deee9f
Show file tree

Hide file tree

Showing 20 changed files with 320 additions and 90 deletions.
diff --git a/php/7.4-cli/Dockerfile b/php/7.4-cli/Dockerfile
@@ -1,14 +1,8 @@
 FROM php:7.4-cli-alpine
 
-RUN mkdir -p /app
-
-WORKDIR /app
-
 # https://github.com/docker-library/php/issues/105#issuecomment-249716758
-RUN set -ex \
- && apk update \
- # Install dependencies
- && apk add --no-cache --virtual .build-deps \
+RUN apk add --no-cache --virtual .build-deps \
+ # Build dependencies
  $PHPIZE_DEPS \
  freetype-dev \
  icu-dev \
@@ -19,6 +13,7 @@ RUN set -ex \
  libxml2-dev \
  libzip-dev \
  && apk add --no-cache \
+ # Runtime dependencies
  freetype \
  git \
  gnu-libiconv \
@@ -53,4 +48,14 @@ RUN set -ex \
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-CMD php
+RUN mkdir -p /app /app-tmp
+
+WORKDIR /app
+
+COPY ./composer_install.sh /app-tmp/composer_install.sh
+RUN chmod a+x /app-tmp/composer_install.sh
+
+# Runs "composer install" if composer.json exists but composer.lock or vendor do not exist
+ENTRYPOINT ["/app-tmp/composer_install.sh"]
+
+CMD ["php"]
diff --git a/php/7.4-cli/composer_install.sh b/php/7.4-cli/composer_install.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+echo "Checking for composer.json and the absence of composer.lock or vendor..."
+if [ -f "composer.json" ] && ( [ ! -f "composer.lock" ] || [ ! -d "vendor" ] ); then
+ echo "Running composer install..."
+ composer \
+ --no-ansi \
+ --no-dev \
+ --no-interaction \
+ --no-progress \
+ --no-scripts \
+ --optimize-autoloader \
+ install
+else
+ echo "No composer installation needed."
+fi
diff --git a/php/7.4-fpm/Dockerfile b/php/7.4-fpm/Dockerfile
@@ -1,14 +1,8 @@
 FROM php:7.4-fpm-alpine
 
-RUN mkdir -p /app
-
-WORKDIR /app
-
 # https://github.com/docker-library/php/issues/105#issuecomment-249716758
-RUN set -ex \
- && apk update \
- # Install dependencies
- && apk add --no-cache --virtual .build-deps \
+RUN apk add --no-cache --virtual .build-deps \
+ # Build dependencies
  $PHPIZE_DEPS \
  freetype-dev \
  icu-dev \
@@ -19,6 +13,7 @@ RUN set -ex \
  libxml2-dev \
  libzip-dev \
  && apk add --no-cache \
+ # Runtime dependencies
  freetype \
  git \
  gnu-libiconv \
@@ -56,4 +51,14 @@ COPY ./phpfpm.conf /usr/local/etc/php-fpm.d/yy-spark.conf
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-CMD php-fpm
+RUN mkdir -p /app /app-tmp
+
+WORKDIR /app
+
+COPY ./composer_install.sh /app-tmp/composer_install.sh
+RUN chmod a+x /app-tmp/composer_install.sh
+
+# Runs "composer install" if composer.json exists but composer.lock or vendor do not exist
+ENTRYPOINT ["/app-tmp/composer_install.sh"]
+
+CMD ["php-fpm"]
diff --git a/php/7.4-fpm/composer_install.sh b/php/7.4-fpm/composer_install.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+echo "Checking for composer.json and the absence of composer.lock or vendor..."
+if [ -f "composer.json" ] && ( [ ! -f "composer.lock" ] || [ ! -d "vendor" ] ); then
+ echo "Running composer install..."
+ composer \
+ --no-ansi \
+ --no-dev \
+ --no-interaction \
+ --no-progress \
+ --no-scripts \
+ --optimize-autoloader \
+ install
+else
+ echo "No composer installation needed."
+fi
diff --git a/php/8.0-cli/Dockerfile b/php/8.0-cli/Dockerfile
@@ -1,14 +1,8 @@
 FROM php:8.0-cli-alpine
 
-RUN mkdir -p /app
-
-WORKDIR /app
-
 # https://github.com/docker-library/php/issues/105#issuecomment-249716758
-RUN set -ex \
- && apk update \
- # Install dependencies
- && apk add --no-cache --virtual .build-deps \
+RUN apk add --no-cache --virtual .build-deps \
+ # Build dependencies
  $PHPIZE_DEPS \
  freetype-dev \
  icu-dev \
@@ -19,6 +13,7 @@ RUN set -ex \
  libxml2-dev \
  libzip-dev \
  && apk add --no-cache \
+ # Runtime dependencies
  freetype \
  git \
  gnu-libiconv \
@@ -53,4 +48,14 @@ RUN set -ex \
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-CMD php
+RUN mkdir -p /app /app-tmp
+
+WORKDIR /app
+
+COPY ./composer_install.sh /app-tmp/composer_install.sh
+RUN chmod a+x /app-tmp/composer_install.sh
+
+# Runs "composer install" if composer.json exists but composer.lock or vendor do not exist
+ENTRYPOINT ["/app-tmp/composer_install.sh"]
+
+CMD ["php"]
diff --git a/php/8.0-cli/composer_install.sh b/php/8.0-cli/composer_install.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+echo "Checking for composer.json and the absence of composer.lock or vendor..."
+if [ -f "composer.json" ] && ( [ ! -f "composer.lock" ] || [ ! -d "vendor" ] ); then
+ echo "Running composer install..."
+ composer \
+ --no-ansi \
+ --no-dev \
+ --no-interaction \
+ --no-progress \
+ --no-scripts \
+ --optimize-autoloader \
+ install
+else
+ echo "No composer installation needed."
+fi
diff --git a/php/8.0-fpm/Dockerfile b/php/8.0-fpm/Dockerfile
@@ -1,14 +1,8 @@
 FROM php:8.0-fpm-alpine
 
-RUN mkdir -p /app
-
-WORKDIR /app
-
 # https://github.com/docker-library/php/issues/105#issuecomment-249716758
-RUN set -ex \
- && apk update \
- # Install dependencies
- && apk add --no-cache --virtual .build-deps \
+RUN apk add --no-cache --virtual .build-deps \
+ # Build dependencies
  $PHPIZE_DEPS \
  freetype-dev \
  icu-dev \
@@ -19,6 +13,7 @@ RUN set -ex \
  libxml2-dev \
  libzip-dev \
  && apk add --no-cache \
+ # Runtime dependencies
  freetype \
  git \
  gnu-libiconv \
@@ -56,4 +51,14 @@ COPY ./phpfpm.conf /usr/local/etc/php-fpm.d/yy-spark.conf
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-CMD php-fpm
+RUN mkdir -p /app /app-tmp
+
+WORKDIR /app
+
+COPY ./composer_install.sh /app-tmp/composer_install.sh
+RUN chmod a+x /app-tmp/composer_install.sh
+
+# Runs "composer install" if composer.json exists but composer.lock or vendor do not exist
+ENTRYPOINT ["/app-tmp/composer_install.sh"]
+
+CMD ["php-fpm"]
diff --git a/php/8.0-fpm/composer_install.sh b/php/8.0-fpm/composer_install.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+echo "Checking for composer.json and the absence of composer.lock or vendor..."
+if [ -f "composer.json" ] && ( [ ! -f "composer.lock" ] || [ ! -d "vendor" ] ); then
+ echo "Running composer install..."
+ composer \
+ --no-ansi \
+ --no-dev \
+ --no-interaction \
+ --no-progress \
+ --no-scripts \
+ --optimize-autoloader \
+ install
+else
+ echo "No composer installation needed."
+fi
diff --git a/php/8.1-cli/Dockerfile b/php/8.1-cli/Dockerfile
@@ -1,14 +1,8 @@
 FROM php:8.1-cli-alpine
 
-RUN mkdir -p /app
-
-WORKDIR /app
-
 # https://github.com/docker-library/php/issues/105#issuecomment-249716758
-RUN set -ex \
- && apk update \
- # Install dependencies
- && apk add --no-cache --virtual .build-deps \
+RUN apk add --no-cache --virtual .build-deps \
+ # Build dependencies
  $PHPIZE_DEPS \
  freetype-dev \
  icu-dev \
@@ -19,6 +13,7 @@ RUN set -ex \
  libxml2-dev \
  libzip-dev \
  && apk add --no-cache \
+ # Runtime dependencies
  freetype \
  git \
  gnu-libiconv \
@@ -53,4 +48,14 @@ RUN set -ex \
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-CMD php
+RUN mkdir -p /app /app-tmp
+
+WORKDIR /app
+
+COPY ./composer_install.sh /app-tmp/composer_install.sh
+RUN chmod a+x /app-tmp/composer_install.sh
+
+# Runs "composer install" if composer.json exists but composer.lock or vendor do not exist
+ENTRYPOINT ["/app-tmp/composer_install.sh"]
+
+CMD ["php"]
diff --git a/php/8.1-cli/composer_install.sh b/php/8.1-cli/composer_install.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+echo "Checking for composer.json and the absence of composer.lock or vendor..."
+if [ -f "composer.json" ] && ( [ ! -f "composer.lock" ] || [ ! -d "vendor" ] ); then
+ echo "Running composer install..."
+ composer \
+ --no-ansi \
+ --no-dev \
+ --no-interaction \
+ --no-progress \
+ --no-scripts \
+ --optimize-autoloader \
+ install
+else
+ echo "No composer installation needed."
+fi
diff --git a/php/8.1-fpm/Dockerfile b/php/8.1-fpm/Dockerfile
@@ -1,14 +1,8 @@
 FROM php:8.1-fpm-alpine
 
-RUN mkdir -p /app
-
-WORKDIR /app
-
 # https://github.com/docker-library/php/issues/105#issuecomment-249716758
-RUN set -ex \
- && apk update \
- # Install dependencies
- && apk add --no-cache --virtual .build-deps \
+RUN apk add --no-cache --virtual .build-deps \
+ # Build dependencies
  $PHPIZE_DEPS \
  freetype-dev \
  icu-dev \
@@ -19,6 +13,7 @@ RUN set -ex \
  libxml2-dev \
  libzip-dev \
  && apk add --no-cache \
+ # Runtime dependencies
  freetype \
  git \
  gnu-libiconv \
@@ -56,4 +51,14 @@ COPY ./phpfpm.conf /usr/local/etc/php-fpm.d/yy-spark.conf
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-CMD php-fpm
+RUN mkdir -p /app /app-tmp
+
+WORKDIR /app
+
+COPY ./composer_install.sh /app-tmp/composer_install.sh
+RUN chmod a+x /app-tmp/composer_install.sh
+
+# Runs "composer install" if composer.json exists but composer.lock or vendor do not exist
+ENTRYPOINT ["/app-tmp/composer_install.sh"]
+
+CMD ["php-fpm"]
diff --git a/php/8.1-fpm/composer_install.sh b/php/8.1-fpm/composer_install.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+echo "Checking for composer.json and the absence of composer.lock or vendor..."
+if [ -f "composer.json" ] && ( [ ! -f "composer.lock" ] || [ ! -d "vendor" ] ); then
+ echo "Running composer install..."
+ composer \
+ --no-ansi \
+ --no-dev \
+ --no-interaction \
+ --no-progress \
+ --no-scripts \
+ --optimize-autoloader \
+ install
+else
+ echo "No composer installation needed."
+fi