From 556c41ff19db5c533f3d8278c1e3f1f466615be7 Mon Sep 17 00:00:00 2001
From: Siroco <siroco@piperrak.cc>
Date: Wed, 3 Nov 2021 20:59:47 +0100
Subject: [PATCH] Update: Change Dockerfile check version && Change variable
 PHP_USER_GROUP to USER_GROUP

---
 .env.example       |  2 +-
 Dockerfile         | 20 +++++++++-----------
 README.md          |  2 +-
 docker-compose.yml |  2 +-
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.env.example b/.env.example
index 42e5655..ae3e737 100644
--- a/.env.example
+++ b/.env.example
@@ -1 +1 @@
-PHP_USER_GROUP=1001:1000
+USER_GROUP=1001:1000
diff --git a/Dockerfile b/Dockerfile
index 23f1769..f037f58 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,19 @@
 FROM registry.sindominio.net/debian
 
-ARG PHP_VERSION=none
-
 RUN apt-get update
-RUN apt-get -qy install php-fpm
-
-RUN export PHP_VERSION=`dpkg -s php-fpm | grep Version | cut -f2 -d" " | cut -d":" -f2 | cut -d"+" -f1`
 
-COPY php-fpm.conf /etc/php/$PHP_VERSION/fpm/php-fpm.conf
-
-RUN echo $PHP_VERSION
+RUN apt-get -qy install php-fpm
 
-RUN echo "include=/etc/php/$PHP_VERSION/fpm/pool.d/*.conf" >> /etc/php/$PHP_VERSION/fpm/php-fpm.conf
+RUN  dpkg -s php-fpm | grep Version | cut -f2 -d" " | cut -d":" -f2 | cut -d"+" -f1 > /tmp/php-fpm.version
 
-COPY www.conf /etc/php/$PHP_VERSION/fpm/pool.d/www.conf
+COPY *.conf /tmp/
 
-RUN ln -s /usr/sbin/php-fpm$PHP_VERSION /usr/sbin/php-fpm
+RUN PHP_VERSION=$(cat /tmp/php-fpm.version) && \
+                cp /tmp/php-fpm.conf /etc/php/$PHP_VERSION/fpm/php-fpm.conf && \
+                echo "include=/etc/php/$PHP_VERSION/fpm/pool.d/*.conf" >> /etc/php/$PHP_VERSION/fpm/php-fpm.conf && \
+                cp /tmp/www.conf /etc/php/$(cat /tmp/php-fpm.version)/fpm/pool.d/www.conf && \
+                ln -s /usr/sbin/php-fpm$PHP_VERSION /usr/sbin/php-fpm && \
+                rm -rf /tmp/*.conf
 
 EXPOSE 9000
 
diff --git a/README.md b/README.md
index 9e9978b..447f7f0 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ cp .env.example .env
 
 Modify variables:
 
-* PHP_USER_GROUP : Specify user and group PHP
+* USER_GROUP : Specify user and group PHP
 
 Build: 
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 027b704..06920ca 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,4 +5,4 @@ services:
     build: .
     image: registry.sindominio.net/php-fpm
     restart: always
-    user: ${PHP_USER_GROUP}
+    user: ${USER_GROUP}