Explorar el Código

Rename COMPOSE_USER to APP_ID

Stephan Hochdörfer hace 3 años
padre
commit
75d26e2ebb
Se han modificado 3 ficheros con 9 adiciones y 9 borrados
  1. 3 3
      images/php/7.3/Dockerfile
  2. 3 3
      images/php/7.4/Dockerfile
  3. 3 3
      images/php/8.0/Dockerfile

+ 3 - 3
images/php/7.3/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.3-fpm-buster
 FROM php:7.3-fpm-buster
 MAINTAINER Mark Shust <mark@shust.com>
 MAINTAINER Mark Shust <mark@shust.com>
 
 
-ARG COMPOSE_USER=1000
+ARG APP_ID=1000
 
 
 RUN apt-get update && apt-get install -y \
 RUN apt-get update && apt-get install -y \
   cron \
   cron \
@@ -73,8 +73,8 @@ RUN curl -o /tmp/ssh2-1.2.tgz https://pecl.php.net/get/ssh2 \
 #RUN pecl install ssh2-1.2 \
 #RUN pecl install ssh2-1.2 \
 #  && docker-php-ext-enable ssh2
 #  && docker-php-ext-enable ssh2
 
 
-RUN groupadd -g "$COMPOSE_USER" app \
-  && useradd -g "$COMPOSE_USER" -u "$COMPOSE_USER" -d /var/www -s /bin/bash app
+RUN groupadd -g "$APP_ID" app \
+  && useradd -g "$APP_ID" -u "$APP_ID" -d /var/www -s /bin/bash app
 
 
 RUN apt-get install -y gnupg \
 RUN apt-get install -y gnupg \
   && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
   && curl -sL https://deb.nodesource.com/setup_14.x | bash - \

+ 3 - 3
images/php/7.4/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.4-fpm-buster
 FROM php:7.4-fpm-buster
 MAINTAINER Mark Shust <mark@shust.com>
 MAINTAINER Mark Shust <mark@shust.com>
 
 
-ARG COMPOSE_USER=1000
+ARG APP_ID=1000
 
 
 RUN apt-get update && apt-get install -y \
 RUN apt-get update && apt-get install -y \
   cron \
   cron \
@@ -73,8 +73,8 @@ RUN curl -o /tmp/ssh2-1.2.tgz https://pecl.php.net/get/ssh2 \
 #RUN pecl install ssh2-1.2 \
 #RUN pecl install ssh2-1.2 \
 #  && docker-php-ext-enable ssh2
 #  && docker-php-ext-enable ssh2
 
 
-RUN groupadd -g "$COMPOSE_USER" app \
-  && useradd -g "$COMPOSE_USER" -u "$COMPOSE_USER" -d /var/www -s /bin/bash app
+RUN groupadd -g "$APP_ID" app \
+  && useradd -g "$APP_ID" -u "$APP_ID" -d /var/www -s /bin/bash app
 
 
 RUN apt-get install -y gnupg \
 RUN apt-get install -y gnupg \
   && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
   && curl -sL https://deb.nodesource.com/setup_14.x | bash - \

+ 3 - 3
images/php/8.0/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:8.0-fpm-buster
 FROM php:8.0-fpm-buster
 MAINTAINER Mark Shust <mark@shust.com>
 MAINTAINER Mark Shust <mark@shust.com>
 
 
-ARG COMPOSE_USER=1000
+ARG APP_ID=1000
 
 
 RUN apt-get update && apt-get install -y \
 RUN apt-get update && apt-get install -y \
   cron \
   cron \
@@ -53,8 +53,8 @@ RUN pecl channel-update pecl.php.net \
 RUN docker-php-ext-enable xdebug \
 RUN docker-php-ext-enable xdebug \
   && sed -i -e 's/^zend_extension/\;zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
   && sed -i -e 's/^zend_extension/\;zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
 
-RUN groupadd -g "$COMPOSE_USER" app \
-  && useradd -g "$COMPOSE_USER" -u "$COMPOSE_USER" -d /var/www -s /bin/bash app
+RUN groupadd -g "$APP_ID" app \
+  && useradd -g "$APP_ID" -u "$APP_ID" -d /var/www -s /bin/bash app
 
 
 RUN apt-get install -y gnupg \
 RUN apt-get install -y gnupg \
   && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
   && curl -sL https://deb.nodesource.com/setup_14.x | bash - \