Run Template + Update Nginx Path

dbpolito · dbpolito · commit c715a1ce4cfd · 2021-07-05T12:45:54.000-03:00
diff --git a/7.1-nginx-prod/entrypoint b/7.1-nginx-prod/entrypoint
@@ -9,7 +9,7 @@ if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
     usermod -u $CURRENT_USER kool
 fi
 
-dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
+dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/http.d/default.conf
 
 # Run entrypoint if provided
 if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
diff --git a/7.1-nginx/entrypoint b/7.1-nginx/entrypoint
@@ -18,7 +18,7 @@ if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
     usermod -u $CURRENT_USER kool
 fi
 
-dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
+dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/http.d/default.conf
 
 # Run entrypoint if provided
 if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
diff --git a/7.1-prod/Dockerfile b/7.1-prod/Dockerfile
@@ -56,6 +56,7 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
+        sockets \
     && pecl install imagick \
     && pecl install redis \
     && docker-php-ext-enable imagick \
diff --git a/7.1/Dockerfile b/7.1/Dockerfile
@@ -56,6 +56,7 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
+        sockets \
     && pecl install imagick \
     && pecl install redis \
     && pecl install xdebug-2.9.8 \
diff --git a/7.2-nginx-prod/entrypoint b/7.2-nginx-prod/entrypoint
@@ -9,7 +9,7 @@ if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
     usermod -u $CURRENT_USER kool
 fi
 
-dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
+dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/http.d/default.conf
 
 # Run entrypoint if provided
 if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
diff --git a/7.2-nginx/entrypoint b/7.2-nginx/entrypoint
@@ -18,7 +18,7 @@ if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
     usermod -u $CURRENT_USER kool
 fi
 
-dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
+dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/http.d/default.conf
 
 # Run entrypoint if provided
 if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
diff --git a/7.2-prod/Dockerfile b/7.2-prod/Dockerfile
@@ -56,6 +56,7 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
+        sockets \
     && pecl install imagick \
     && pecl install redis \
     && docker-php-ext-enable imagick \
diff --git a/7.2/Dockerfile b/7.2/Dockerfile
@@ -56,6 +56,7 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
+        sockets \
     && pecl install imagick \
     && pecl install redis \
     && pecl install xdebug \
diff --git a/7.3-nginx-prod/entrypoint b/7.3-nginx-prod/entrypoint
@@ -9,7 +9,7 @@ if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
     usermod -u $CURRENT_USER kool
 fi
 
-dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
+dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/http.d/default.conf
 
 # Run entrypoint if provided
 if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
diff --git a/7.3-nginx/entrypoint b/7.3-nginx/entrypoint
@@ -18,7 +18,7 @@ if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
     usermod -u $CURRENT_USER kool
 fi
 
-dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
+dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/http.d/default.conf
 
 # Run entrypoint if provided
 if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
diff --git a/7.3-prod/Dockerfile b/7.3-prod/Dockerfile
@@ -56,6 +56,7 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
+        sockets \
     && pecl install imagick \
     && pecl install redis \
     && docker-php-ext-enable imagick \
diff --git a/7.3/Dockerfile b/7.3/Dockerfile
@@ -56,6 +56,7 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
+        sockets \
     && pecl install imagick \
     && pecl install redis \
     && pecl install xdebug \
diff --git a/7.4-nginx-prod/entrypoint b/7.4-nginx-prod/entrypoint
@@ -9,7 +9,7 @@ if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
     usermod -u $CURRENT_USER kool
 fi
 
-dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
+dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/http.d/default.conf
 
 # Run entrypoint if provided
 if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
diff --git a/7.4-nginx/entrypoint b/7.4-nginx/entrypoint
@@ -18,7 +18,7 @@ if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
     usermod -u $CURRENT_USER kool
 fi
 
-dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
+dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/http.d/default.conf
 
 # Run entrypoint if provided
 if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
diff --git a/7.4-prod/Dockerfile b/7.4-prod/Dockerfile
@@ -53,6 +53,7 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
+        sockets \
     && pecl install imagick \
     && pecl install redis \
     && docker-php-ext-enable imagick \
diff --git a/7.4/Dockerfile b/7.4/Dockerfile
@@ -53,6 +53,7 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
+        sockets \
     && pecl install imagick \
     && pecl install redis \
     && pecl install xdebug \
diff --git a/8.0-nginx-prod/entrypoint b/8.0-nginx-prod/entrypoint
@@ -9,7 +9,7 @@ if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
     usermod -u $CURRENT_USER kool
 fi
 
-dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
+dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/http.d/default.conf
 
 # Run entrypoint if provided
 if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
diff --git a/8.0-nginx/entrypoint b/8.0-nginx/entrypoint
@@ -18,7 +18,7 @@ if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
     usermod -u $CURRENT_USER kool
 fi
 
-dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
+dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/http.d/default.conf
 
 # Run entrypoint if provided
 if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
diff --git a/8.0-prod/Dockerfile b/8.0-prod/Dockerfile
@@ -53,6 +53,7 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
+        sockets \
     # Temporarily building for PHP 8.0: https://github.com/Imagick/imagick/issues/358
     && git clone https://github.com/Imagick/imagick \
     && cd imagick \
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
@@ -53,6 +53,7 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
+        sockets \
     # Temporarily building for PHP 8.0: https://github.com/Imagick/imagick/issues/358
     && git clone https://github.com/Imagick/imagick \
     && cd imagick \
diff --git a/template/entrypoint.blade.php b/template/entrypoint.blade.php
@@ -20,7 +20,7 @@
     usermod -u $CURRENT_USER kool
 fi
 
-dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf {!! $nginx ? '-template /kool/default.tmpl:/etc/nginx/conf.d/default.conf' : '' !!}
+dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf {!! $nginx ? '-template /kool/default.tmpl:/etc/nginx/http.d/default.conf' : '' !!}
 
 # Run entrypoint if provided
 if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
