From af88c5c9e203263be686100e1e316e95a499c0a9 Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 4 Jul 2023 11:59:34 +0200 Subject: [PATCH 1/8] Fix variable name --- application/views/user/edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/user/edit.php b/application/views/user/edit.php index ff3586c2..a3110a44 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -476,7 +476,7 @@
- +
From 8b83c84f7a1a2339017bc6ac64120f0a6889864b Mon Sep 17 00:00:00 2001 From: Luca <61653175+iu2frl@users.noreply.github.com> Date: Tue, 4 Jul 2023 15:35:46 +0200 Subject: [PATCH 2/8] Improving Dockerfile syntax --- docker/Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f77d1400..b981fcb0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,14 +7,13 @@ RUN touch /usr/local/etc/php/conf.d/uploads.ini \ && echo "max_execution_time = 60" >> /usr/local/etc/php/conf.d/uploads.ini RUN apt-get update \ && apt-get install -y git curl libxml2-dev libonig-dev -RUN docker-php-ext-install mysqli +RUN docker-php-ext-install mysqli mbstring xml #RUN docker-php-ext-install curl -RUN docker-php-ext-install mbstring -RUN docker-php-ext-install xml #RUN docker-php-ext-install openssl -WORKDIR /var/www/html +RUN rm -rf /var/www/html/docker/ COPY ./ /var/www/html/ -RUN ls && rm -rf /var/www/html/docker/ \ +WORKDIR /var/www/html +RUN cd /var/www/html && ls \ && chown -R root:www-data ./application/config/ \ && chown -R root:www-data ./application/logs/ \ && chown -R root:www-data ./assets/qslcard/ \ From 52b6bd893953db02e3ff2f44f4c7be2baef68a9f Mon Sep 17 00:00:00 2001 From: Luca <61653175+iu2frl@users.noreply.github.com> Date: Tue, 4 Jul 2023 15:48:33 +0200 Subject: [PATCH 3/8] Testing https://github.com/magicbug/Cloudlog/issues/2244 --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index b981fcb0..63981496 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -29,4 +29,5 @@ RUN cd /var/www/html && ls \ && chmod -R g+rw ./updates/ \ && chmod -R g+rw ./uploads/ \ && chmod -R g+rw ./images/eqsl_card_images/ \ -&& chmod -R g+rw ./assets/json/ +&& chmod -R g+rw ./assets/json/ \ +&& chmod 777 /var/www/html/install From 76dea7bd82eace9d5e726d91547fd2eb1508c815 Mon Sep 17 00:00:00 2001 From: Luca <61653175+iu2frl@users.noreply.github.com> Date: Tue, 4 Jul 2023 17:07:15 +0200 Subject: [PATCH 4/8] Setting root as owner of files --- docker/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 63981496..87cb2975 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,14 +14,14 @@ RUN rm -rf /var/www/html/docker/ COPY ./ /var/www/html/ WORKDIR /var/www/html RUN cd /var/www/html && ls \ -&& chown -R root:www-data ./application/config/ \ -&& chown -R root:www-data ./application/logs/ \ -&& chown -R root:www-data ./assets/qslcard/ \ -&& chown -R root:www-data ./backup/ \ -&& chown -R root:www-data ./updates/ \ -&& chown -R root:www-data ./uploads/ \ -&& chown -R root:www-data ./images/eqsl_card_images/ \ -&& chown -R root:www-data ./assets/json/ \ +&& chown -R root:root ./application/config/ \ +&& chown -R root:root ./application/logs/ \ +&& chown -R root:root ./assets/qslcard/ \ +&& chown -R root:root ./backup/ \ +&& chown -R root:root ./updates/ \ +&& chown -R root:root ./uploads/ \ +&& chown -R root:root ./images/eqsl_card_images/ \ +&& chown -R root:root ./assets/json/ \ && chmod -R g+rw ./application/config/ \ && chmod -R g+rw ./application/logs/ \ && chmod -R g+rw ./assets/qslcard/ \ From 0d6adb0edf046a7232869731702bc46637e92c31 Mon Sep 17 00:00:00 2001 From: Luca <61653175+iu2frl@users.noreply.github.com> Date: Tue, 4 Jul 2023 17:12:26 +0200 Subject: [PATCH 5/8] More concise Dockerfile --- docker/Dockerfile | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 87cb2975..80ebd6a3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,21 +13,10 @@ RUN docker-php-ext-install mysqli mbstring xml RUN rm -rf /var/www/html/docker/ COPY ./ /var/www/html/ WORKDIR /var/www/html -RUN cd /var/www/html && ls \ -&& chown -R root:root ./application/config/ \ -&& chown -R root:root ./application/logs/ \ -&& chown -R root:root ./assets/qslcard/ \ -&& chown -R root:root ./backup/ \ -&& chown -R root:root ./updates/ \ -&& chown -R root:root ./uploads/ \ -&& chown -R root:root ./images/eqsl_card_images/ \ -&& chown -R root:root ./assets/json/ \ -&& chmod -R g+rw ./application/config/ \ -&& chmod -R g+rw ./application/logs/ \ -&& chmod -R g+rw ./assets/qslcard/ \ -&& chmod -R g+rw ./backup/ \ -&& chmod -R g+rw ./updates/ \ -&& chmod -R g+rw ./uploads/ \ -&& chmod -R g+rw ./images/eqsl_card_images/ \ -&& chmod -R g+rw ./assets/json/ \ -&& chmod 777 /var/www/html/install +RUN cd /var/www/html \ +&& echo "Setting root as owner of the folder..." \ +&& chown -R root:root /var/www/html \ +&& echo "Setting permissions to the install folder" \ +&& chmod 777 /var/www/html/install \ +&& echo "Make sure everything is fine" \ +&& dir -ls From 1a13f94264873c722d013b7527cb5d6c5c48292c Mon Sep 17 00:00:00 2001 From: Luca <61653175+iu2frl@users.noreply.github.com> Date: Tue, 4 Jul 2023 17:33:08 +0200 Subject: [PATCH 6/8] Update Dockerfile --- docker/Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 80ebd6a3..cd3dc934 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,6 +17,14 @@ RUN cd /var/www/html \ && echo "Setting root as owner of the folder..." \ && chown -R root:root /var/www/html \ && echo "Setting permissions to the install folder" \ +&& chmod -R g+rw ./application/config/ \ +&& chmod -R g+rw ./application/logs/ \ +&& chmod -R g+rw ./assets/qslcard/ \ +&& chmod -R g+rw ./backup/ \ +&& chmod -R g+rw ./updates/ \ +&& chmod -R g+rw ./uploads/ \ +&& chmod -R g+rw ./images/eqsl_card_images/ \ +&& chmod -R g+rw ./assets/json/ \ && chmod 777 /var/www/html/install \ && echo "Make sure everything is fine" \ && dir -ls From ed631e15a0399ecc2c9c12b4b1c8831c32f14e9c Mon Sep 17 00:00:00 2001 From: Luca <61653175+iu2frl@users.noreply.github.com> Date: Tue, 4 Jul 2023 17:33:57 +0200 Subject: [PATCH 7/8] Restoring permissions settings --- docker/Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index cd3dc934..87173368 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,6 +17,14 @@ RUN cd /var/www/html \ && echo "Setting root as owner of the folder..." \ && chown -R root:root /var/www/html \ && echo "Setting permissions to the install folder" \ +&& chown -R root:root ./application/config/ \ +&& chown -R root:root ./application/logs/ \ +&& chown -R root:root ./assets/qslcard/ \ +&& chown -R root:root ./backup/ \ +&& chown -R root:root ./updates/ \ +&& chown -R root:root ./uploads/ \ +&& chown -R root:root ./images/eqsl_card_images/ \ +&& chown -R root:root ./assets/json/ \ && chmod -R g+rw ./application/config/ \ && chmod -R g+rw ./application/logs/ \ && chmod -R g+rw ./assets/qslcard/ \ From 6c2686e95e6e96705ffd57171f9fcfb53a103339 Mon Sep 17 00:00:00 2001 From: Luca <61653175+iu2frl@users.noreply.github.com> Date: Tue, 4 Jul 2023 17:57:45 +0200 Subject: [PATCH 8/8] Fixing permission as reported in https://github.com/magicbug/Cloudlog/issues/2244 --- docker/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 87173368..bee0e909 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,14 +17,14 @@ RUN cd /var/www/html \ && echo "Setting root as owner of the folder..." \ && chown -R root:root /var/www/html \ && echo "Setting permissions to the install folder" \ -&& chown -R root:root ./application/config/ \ -&& chown -R root:root ./application/logs/ \ -&& chown -R root:root ./assets/qslcard/ \ -&& chown -R root:root ./backup/ \ -&& chown -R root:root ./updates/ \ -&& chown -R root:root ./uploads/ \ -&& chown -R root:root ./images/eqsl_card_images/ \ -&& chown -R root:root ./assets/json/ \ +&& chown -R root:www-data ./application/config/ \ +&& chown -R root:www-data ./application/logs/ \ +&& chown -R root:www-data ./assets/qslcard/ \ +&& chown -R root:www-data ./backup/ \ +&& chown -R root:www-data ./updates/ \ +&& chown -R root:www-data ./uploads/ \ +&& chown -R root:www-data ./images/eqsl_card_images/ \ +&& chown -R root:www-data ./assets/json/ \ && chmod -R g+rw ./application/config/ \ && chmod -R g+rw ./application/logs/ \ && chmod -R g+rw ./assets/qslcard/ \