From 97da7f0d4fb254f337a76cba576b14e68f7cc66a Mon Sep 17 00:00:00 2001
From: nirpt <108334749+nirpt@users.noreply.github.com>
Date: Sun, 28 Aug 2022 11:29:20 +0200
Subject: [PATCH 1/2] Minor refactor and cleanup

---
 docker/Dockerfile | 10 +++++-----
 docker/README.md  | 21 ++++++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 17abcd4..e900a6a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,12 +2,12 @@ FROM php:7.4.21-apache
 ENV APP_VERSION=1.0.0
 
 RUN apt-get update && \
-    apt-get install -y less nano tini curl tar git zip unzip && \
+    apt-get install -y --no-install-recommends less nano tini curl tar git zip unzip && \
     #echo "**** # To install networking tools for testing purpose ****" && \
-    apt-get install -y iputils-ping dnsutils net-tools procps
+    apt-get install -y --no-install-recommends iputils-ping dnsutils net-tools procps && \
     #echo "**** cleanup ****" && \
-    #apt-get autoremove -y && \
-    #apt-get clean -y
+    apt-get autoremove -y && \
+    apt-get clean -y
 
 # curl -SL -o app.tar.gz "https://github.com/giandonatoinverso/PHP-Dynamic-Qr-code/archive/${APP_VERSION}.tar.gz"  \
 RUN curl -SL -o app.tar.gz "https://github.com/giandonatoinverso/PHP-Dynamic-Qr-code/archive/refs/heads/master.tar.gz"  \
@@ -17,7 +17,7 @@ RUN curl -SL -o app.tar.gz "https://github.com/giandonatoinverso/PHP-Dynamic-Qr-
     && rm app.tar.gz
 
 RUN apt-get update
-RUN apt-get install -y libzip-dev libjpeg62-turbo-dev libpng-dev libfreetype6-dev
+RUN apt-get install -y --no-install-recommends libzip-dev libjpeg62-turbo-dev libpng-dev libfreetype6-dev
 
 # install composer
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
diff --git a/docker/README.md b/docker/README.md
index ceb831a..7bbecc4 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,27 +1,30 @@
 ### How to run this image
+
 - currently this image must be build locally.(in future can be pulled from docker hub)
 - create folder to mount inside docker container
-    - `mkdir -p ./data/mariadb ./data/app/config ./data/app/saved_qrcode`
+  - `mkdir -p ./data/mariadb ./data/app/config ./data/app/saved_qrcode`
 - Run and build this image as host machine user
-    - `PUID="$(id -u)" PGID="$(id -g)" docker-compose up --build -d`
+  - `PUID="$(id -u)" PGID="$(id -g)" docker-compose up --build -d`
 - Run and build this image as specific user
-    - `PUID="1000" PGID="1000" docker-compose up --build -d`
+  - `PUID="1000" PGID="1000" docker-compose up --build -d`
 - Run app installation <IP>:8080/install
-    - Provide Database credentials
+  - Provide Database credentials
 - Default login: <IP>:8080
-    - user: superadmin
-    - password: superadmin
+  - user: superadmin
+  - password: superadmin
 
 ### Roadmap
+
 - Make install process run via docker-compose.
-    - Work is partially done. docker-entrypoint.sh is created.(currently disabled due to next steps are pending)
-    - qrcode/install/database.php should be adjusted to create database without form submission.
+  - Work is partially done. docker-entrypoint.sh is created.(currently disabled due to next steps are pending)
+  - qrcode/install/database.php should be adjusted to create database without form submission.
 - Make it possible to set PUID and GUID, from environment variable in docker-compose.yml .
 - Reduce image size by removing unnecessary dependencies.
 - Automate Build image and push to docker hub.
 - Audit security flaws and fix it if needed.
 
-### some debug commands
+### Some debug commands
+
 - `docker-compose logs`
 - `PUID="$(id -u)" PGID="$(id -g)" docker-compose config`
 - `ps -aef | grep apache2`
\ No newline at end of file

From 2aa867aa2af166668dab44b2be29a14a596da778 Mon Sep 17 00:00:00 2001
From: nirpt <108334749+nirpt@users.noreply.github.com>
Date: Mon, 29 Aug 2022 12:32:20 +0200
Subject: [PATCH 2/2] Docker build with app version added.

---
 docker/Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index e900a6a..17f1fd6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
 FROM php:7.4.21-apache
-ENV APP_VERSION=1.0.0
+ARG APP_VERSION=v1.0.0Do
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends less nano tini curl tar git zip unzip && \
@@ -9,8 +9,7 @@ RUN apt-get update && \
     apt-get autoremove -y && \
     apt-get clean -y
 
-# curl -SL -o app.tar.gz "https://github.com/giandonatoinverso/PHP-Dynamic-Qr-code/archive/${APP_VERSION}.tar.gz"  \
-RUN curl -SL -o app.tar.gz "https://github.com/giandonatoinverso/PHP-Dynamic-Qr-code/archive/refs/heads/master.tar.gz"  \
+RUN curl -SL -o app.tar.gz "https://github.com/giandonatoinverso/PHP-Dynamic-Qr-code/archive/${APP_VERSION}.tar.gz"  \
     && mkdir -p /app \
     && tar xvf app.tar.gz -C /app --strip-components=1 \
     && cp -r /app/qrcode/** /var/www/html \