#2: Build and publish Docker images using GitLab CI.

---
Add the ability to build & publish a docker image to the Gitlab
container registry when tagging a commit.

For now we'll publish both tag (i.e. `x.x.x`) and `latest` upon trigger.

It's assumed tags are only set on the default branch and only limited
amount people have tag rights. As it publishes `latest` it's important
not to push breaking / untested releases. If required a more elaborate
setup can be created, but let's start somewhere.

For now it's assumed in README.md files we're going to publish to the
GitLab Container Registry, with $CI_REGISTRY/$CI_REGISTRY_IMAGE
variables resolving to `registry.gitlab.com/jirafeau/jirafeau`.

Changes:
- Fixup of several pre-existing linter errors in `php` files
- Cleanup `Dockerfile`, merged `COPY` & `RUN` layers leveraging BuildKit
- Added `publish` pipeline step to be triggered using `tags`
- Updated docker image related references in `README.md`
- Refactored `.gitlab-ci.yaml` to only run `before_script` for linters

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d2d9c4a51ab8160a903b2431f48fa72e4b12598..bf59897709bdf80f812c79592948627fdd45e9ab 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,35 +1,45 @@
-# Select docker image from https://hub.docker.com/_/php/
-image: php:8.1
-

 # Select what we should cache
 cache:
   paths:
     - vendor/
 
 # Select what we should cache
 cache:
   paths:
     - vendor/
 

-before_script:
-  # Install git, the docker php image doesn't have it installed by default
-  - apt-get update -yqq
-  - apt-get install git -yqq
-  - apt-get install zip -yqq
-  # Enable necessary php extensions
-  - docker-php-ext-enable curl && docker-php-ext-enable json && docker-php-ext-enable zip && docker-php-ext-enable mbstring && docker-php-ext-enable gd && docker-php-ext-enable pdo_mysql
-  # Install composer
-  - curl -sS https://getcomposer.org/installer | php
-  # Create composer.json file manually, since this is a project without any non-dev dependencies yet
-  - php composer.phar require --dev php-parallel-lint/php-parallel-lint
-  - php composer.phar require --dev friendsofphp/php-cs-fixer:3.10.0
-  # Install all project dependencies
-  - php composer.phar install
-
-# Run tests
+# Run tests for php:8.1

 job_lint_app_81:
   image: php:8.1
 job_lint_app_81:
   image: php:8.1

-  script:
+  before_script: &before_linter_script
+    # Install git, the docker php image doesn't have it installed by default
+    - apt-get update -yqq
+    - apt-get install git -yqq
+    - apt-get install zip -yqq
+    # Enable necessary php extensions
+    - docker-php-ext-enable curl && docker-php-ext-enable json && docker-php-ext-enable zip && docker-php-ext-enable mbstring && docker-php-ext-enable gd && docker-php-ext-enable pdo_mysql
+    # Install composer
+    - curl -sS https://getcomposer.org/installer | php
+    # Create composer.json file manually, since this is a project without any non-dev dependencies yet
+    - php composer.phar require --dev php-parallel-lint/php-parallel-lint
+    - php composer.phar require --dev friendsofphp/php-cs-fixer:3.10.0
+    # Install all project dependencies
+    - php composer.phar install
+  script: &linter_script

     - ./vendor/bin/parallel-lint --exclude vendor .
     - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --using-cache=no --rules=@PSR2
 
     - ./vendor/bin/parallel-lint --exclude vendor .
     - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --using-cache=no --rules=@PSR2
 

+# Run tests for php:7.4

 job_lint_app_74:
   image: php:7.4
 job_lint_app_74:
   image: php:7.4

+  before_script: *before_linter_script
+  script: *linter_script
+
+publish:
+  image: docker:latest
+  stage: deploy
+  services:
+    - docker:dind

   script:
   script:

-    - ./vendor/bin/parallel-lint --exclude vendor .
-    - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --using-cache=no --rules=@PSR2
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
+    - docker build -t $CI_REGISTRY/$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG .
+    # If we're on the default branch, also tag the image as latest
+    - docker build -t  $CI_REGISTRY/$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG -t $CI_REGISTRY/$CI_REGISTRY_IMAGE:latest .
+    - docker push $CI_REGISTRY/$CI_REGISTRY_IMAGE --all-tags
+  only:
+    - tags

diff --git a/Dockerfile b/Dockerfile
index 9eb04233aa3b0d2d3acd2d55a0126c62a336b24f..d4854a8fcbdf4e01f330a041f1f4577d0feb83e9 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,24 +8,21 @@ RUN apk update && \
     ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime  && \
     echo "UTC" > /etc/timezone
 
     ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime  && \
     echo "UTC" > /etc/timezone
 

-COPY docker/cleanup.sh /cleanup.sh
-COPY docker/run.sh /run.sh
-RUN chmod o=,ug=rx /cleanup.sh /run.sh
-COPY docker/docker_config.php /docker_config.php
+COPY --chmod=550 docker/cleanup.sh docker/run.sh  /
+COPY --chmod=640 docker/docker_config.php /docker_config.php

 
 

-RUN mkdir -p /usr/local/etc/php

 COPY docker/php.ini /usr/local/etc/php/php.ini
 COPY docker/lighttpd.conf /etc/lighttpd/lighttpd.conf
 
 COPY docker/php.ini /usr/local/etc/php/php.ini
 COPY docker/lighttpd.conf /etc/lighttpd/lighttpd.conf
 

-# install jirafeau
-RUN mkdir /www
+# Install Jirafeau

 WORKDIR /www
 WORKDIR /www

-# Will ignore some files through .dockerignore
-COPY . .
-RUN rm -rf docker && \
+
+RUN --mount=type=bind,source=.,target=/mnt \
+    cp -r /mnt/* /www/ && \
+    rm -rf /www/docker && \

     touch /www/lib/config.local.php && \
     chown -R $(id -u lighttpd).$(id -g www-data) /www && \
     touch /www/lib/config.local.php && \
     chown -R $(id -u lighttpd).$(id -g www-data) /www && \

-    chmod o=,ug=rwX -R /www
+    chmod 770 /www

 
 

-CMD /run.sh
+CMD ["/run.sh"]

 EXPOSE 80
\ No newline at end of file
 EXPOSE 80
\ No newline at end of file

diff --git a/README.md b/README.md
index 7d89261b18fa5a9f7cef5d6d01d6816e50d7bcbb..4fff851c3272262e57ff870646e6feb43e9c3973 100644 (file)
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ Jirafeau project won't evolve to a file manager and will focus to keep a very fe
 ## Installation
 
 This shows how to install Jirafeau by your own, it's quite simple but you can
 ## Installation
 
 This shows how to install Jirafeau by your own, it's quite simple but you can

-also use a [docker image](https://hub.docker.com/r/mojo42/jirafeau/) or build
+also use a [docker image](https://gitlab.com/jirafeau/Jirafeau/container_registry/) or build

 it yourself. Check [docker folder](docker/README.md) for more informations.
 
 System requirements:
 it yourself. Check [docker folder](docker/README.md) for more informations.
 
 System requirements:

diff --git a/docker/README.md b/docker/README.md
index 2c56d26a1ab63d5b40850894751c62dc08bd11c7..e7e68d7920d68a96e04dfbb0ba65c80d19f5127b 100644 (file)
--- a/docker/README.md
+++ b/docker/README.md
@@ -7,8 +7,8 @@
 Jirafeau is a small PHP application so running it inside a docker container is pretty straightforward.
 
 ```
 Jirafeau is a small PHP application so running it inside a docker container is pretty straightforward.
 
 ```

-docker pull mojo42/jirafeau:latest
-docker run -it --rm -p 8080:80 mojo42/jirafeau:latest
+docker pull registry.gitlab.com/jirafeau:latest
+docker run -it --rm -p 8080:80 registry.gitlab.com/jirafeau/jirafeau:latest

 ```
 
 Then connect on [localhost:8080](http://localhost:8080/).
 ```
 
 Then connect on [localhost:8080](http://localhost:8080/).


@@ -26,7 +26,7 @@ docker build -t your/jirafeau:latest .
 
 You may be interested in running Jirafeau on port 80:
 ```
 
 You may be interested in running Jirafeau on port 80:
 ```

-docker run -d -p 80:80 --sysctl net.ipv4.ip_unprivileged_port_start=80 mojo42/jirafeau
+docker run -d -p 80:80 --sysctl net.ipv4.ip_unprivileged_port_start=80 registry.gitlab.com/jirafeau/jirafeau

 ```
 
 Note that Jirafeau image does not provide any SSL/TLS. You may be interested in using [docker compose](https://docs.docker.com/compose/) combined with [Let's Encrypt](https://letsencrypt.org/).
 ```
 
 Note that Jirafeau image does not provide any SSL/TLS. You may be interested in using [docker compose](https://docs.docker.com/compose/) combined with [Let's Encrypt](https://letsencrypt.org/).


@@ -66,7 +66,7 @@ Available options:
 
 Example:
 ```
 
 Example:
 ```

-docker run -it -p 8080:80 --rm -e ADMIN_PASSWORD='p4ssw0rd' -e WEB_ROOT='jirafeau.mydomain.com/' -e UPLOAD_PASSWORD='foo,bar' -e PREVIEW=0  mojo42/jirafeau:latest
+docker run -it -p 8080:80 --rm -e ADMIN_PASSWORD='p4ssw0rd' -e WEB_ROOT='jirafeau.mydomain.com/' -e UPLOAD_PASSWORD='foo,bar' -e PREVIEW=0  registry.gitlab.com/jirafeau/jirafeau:latest

 ```
 
 ## Data storage
 ```
 
 ## Data storage


@@ -77,7 +77,7 @@ Note that configuration is not stored in /data.
 Example of using a dedicated volume to store Jirafeau data separately from the container:
 ```
 docker volume create jirafeau_data
 Example of using a dedicated volume to store Jirafeau data separately from the container:
 ```
 docker volume create jirafeau_data

-docker run -it --rm -p 8080:80 --mount source=jirafeau_data,target=/data mojo42/jirafeau:latest
+docker run -it --rm -p 8080:80 --mount source=jirafeau_data,target=/data registry.gitlab.com/jirafeau/jirafeau:latest

 ```
 
 ## Few notes
 ```
 
 ## Few notes

diff --git a/docker/docker_config.php b/docker/docker_config.php
index 634d58bfdcc5373a2b24f648006bc174a1be732f..0becc2da3c601b4e13304d80610b6d2bf9b13cab 100644 (file)
--- a/docker/docker_config.php
+++ b/docker/docker_config.php
@@ -194,4 +194,4 @@ function run_setup(&$cfg)
     }
 }
 
     }
 }
 

-run_setup($cfg);
\ No newline at end of file
+run_setup($cfg);

diff --git a/index.php b/index.php
index 78c1beb42a647e5688660b9cea7e415ebfd8f88a..37dd6778dc84ce3249f14b792d68bcbe9e26005b 100644 (file)
--- a/index.php
+++ b/index.php
@@ -25,7 +25,7 @@ require(JIRAFEAU_ROOT . 'lib/settings.php');
 require(JIRAFEAU_ROOT . 'lib/functions.php');
 require(JIRAFEAU_ROOT . 'lib/lang.php');
 
 require(JIRAFEAU_ROOT . 'lib/functions.php');
 require(JIRAFEAU_ROOT . 'lib/lang.php');
 

-if ($cfg['download_password_requirement'] === "generated"){
+if ($cfg['download_password_requirement'] === "generated") {

     $download_pass = jirafeau_gen_download_pass($cfg['download_password_gen_len'], $cfg['download_password_gen_chars']);
 }
 
     $download_pass = jirafeau_gen_download_pass($cfg['download_password_gen_len'], $cfg['download_password_gen_chars']);
 }
 


@@ -114,8 +114,8 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
     </p>
     </div>
 
     </p>
     </div>
 

-    <?php if ($cfg['download_password_requirement'] === "generated"){
-    ?>
+    <?php if ($cfg['download_password_requirement'] === "generated") {
+        ?>

     <div id="show_password">
     <p><?php echo t('PSW') ?></p>
 
     <div id="show_password">
     <p><?php echo t('PSW') ?></p>
 


@@ -206,15 +206,15 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
             echo '<tr><td>' . t('ONE_TIME_DL') . ':</td>';
             echo '<td><input type="checkbox" id="one_time_download" /></td></tr>';
         }
             echo '<tr><td>' . t('ONE_TIME_DL') . ':</td>';
             echo '<td><input type="checkbox" id="one_time_download" /></td></tr>';
         }

-        if ($cfg['download_password_requirement'] === 'generated'){
+        if ($cfg['download_password_requirement'] === 'generated') {

             echo '<input type="hidden" name="key" id="input_key" value="' . $download_pass .'"/>';
             echo '<input type="hidden" name="key" id="input_key" value="' . $download_pass .'"/>';

-        }else{
+        } else {

             echo '<tr><td><label for="input_key">' . t('PSW') . ':' . '</label></td>';
             echo '<td><input type="password" name="key" id="input_key" autocomplete = "new-password"';
             echo '<tr><td><label for="input_key">' . t('PSW') . ':' . '</label></td>';
             echo '<td><input type="password" name="key" id="input_key" autocomplete = "new-password"';

-            if ($cfg['download_password_policy'] === 'regex'){
+            if ($cfg['download_password_policy'] === 'regex') {

                 echo ' pattern="' . substr($cfg['download_password_policy_regex'], 1, strlen($cfg['download_password_policy_regex']) - 2) . '"'; //remove php delimiters
             }
                 echo ' pattern="' . substr($cfg['download_password_policy_regex'], 1, strlen($cfg['download_password_policy_regex']) - 2) . '"'; //remove php delimiters
             }

-            if ($cfg['download_password_requirement'] === 'required'){
+            if ($cfg['download_password_requirement'] === 'required') {

                 echo ' required';
             }
             echo '/></td></tr>';
                 echo ' required';
             }
             echo '/></td></tr>';

diff --git a/lib/functions.php b/lib/functions.php
index b3a84ac64620961b9acb07e32a59c0034f84bafc..4736b7f35b2d1b3d9454f631f26e28b824cfadeb 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -143,7 +143,6 @@ function jirafeau_human_size($octets)
 // Convert UTC timestamp to a datetime field
 function jirafeau_get_datetimefield($timestamp)
 {
 // Convert UTC timestamp to a datetime field
 function jirafeau_get_datetimefield($timestamp)
 {

-

     $ts = date_create("@" . $timestamp);
     $content = '<span class="datetime" data-datetime="' . date_format($ts, 'Y-m-d H:i') . '">'
         . date_format($ts, 'Y-m-d H:i') . ' (GMT)</span>';
     $ts = date_create("@" . $timestamp);
     $content = '<span class="datetime" data-datetime="' . date_format($ts, 'Y-m-d H:i') . '">'
         . date_format($ts, 'Y-m-d H:i') . ' (GMT)</span>';


@@ -1239,7 +1238,7 @@ function jirafeau_encrypt_file($fp_src, $fp_dst)
         $enc = sodium_crypto_secretstream_xchacha20poly1305_push($crypt_state, $to_enc);
 
         if (fwrite($w, $enc) === false) {
         $enc = sodium_crypto_secretstream_xchacha20poly1305_push($crypt_state, $to_enc);
 
         if (fwrite($w, $enc) === false) {

-           return '';
+            return '';

         }
     }
 
         }
     }
 

diff --git a/script.php b/script.php
index f32ab2048396a152cec5ec7028e360668662593f..8ebcce325fd078b50ada64535c7adc372c9f1285 100644 (file)
--- a/script.php
+++ b/script.php
@@ -81,13 +81,13 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];

-        if ($cfg['download_password_requirement'] !== 'generated' && $cfg['download_password_policy'] === 'regex'){
-            if (!preg_match($cfg['download_password_policy_regex'], $key)){
+        if ($cfg['download_password_requirement'] !== 'generated' && $cfg['download_password_policy'] === 'regex') {
+            if (!preg_match($cfg['download_password_policy_regex'], $key)) {

                 echo 'Error 14: The download password is not complying to the security standards.';
                 exit;
             }
         }
                 echo 'Error 14: The download password is not complying to the security standards.';
                 exit;
             }
         }

-    }elseif ($cfg['download_password_requirement'] !== 'optional'){
+    } elseif ($cfg['download_password_requirement'] !== 'optional') {

         echo 'Error 13: The parameter password is required.';
         exit;
     }
         echo 'Error 13: The parameter password is required.';
         exit;
     }


@@ -175,13 +175,13 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];

-        if ($cfg['download_password_requirement'] !== 'generated' && $cfg['download_password_policy'] === 'regex'){
-            if (!preg_match($cfg['download_password_policy_regex'], $key)){
+        if ($cfg['download_password_requirement'] !== 'generated' && $cfg['download_password_policy'] === 'regex') {
+            if (!preg_match($cfg['download_password_policy_regex'], $key)) {

                 echo 'Error 14: The download password is not complying to the security standards.';
                 exit;
             }
         }
                 echo 'Error 14: The download password is not complying to the security standards.';
                 exit;
             }
         }

-    }elseif ($cfg['download_password_requirement'] !== 'optional'){
+    } elseif ($cfg['download_password_requirement'] !== 'optional') {

         echo 'Error 13: The parameter password is required.';
         exit;
     }
         echo 'Error 13: The parameter password is required.';
         exit;
     }


@@ -451,13 +451,13 @@ elseif (isset($_GET['init_async'])) {
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];

-        if ($cfg['download_password_requirement'] !== 'generated' && $cfg['download_password_policy'] === 'regex'){
-            if (!preg_match($cfg['download_password_policy_regex'], $key)){
+        if ($cfg['download_password_requirement'] !== 'generated' && $cfg['download_password_policy'] === 'regex') {
+            if (!preg_match($cfg['download_password_policy_regex'], $key)) {

                 echo 'Error 14: The download password is not complying to the security standards.';
                 exit;
             }
         }
                 echo 'Error 14: The download password is not complying to the security standards.';
                 exit;
             }
         }

-    }elseif ($cfg['download_password_requirement'] !== 'optional'){
+    } elseif ($cfg['download_password_requirement'] !== 'optional') {

         echo 'Error 13: The parameter password is required.';
         exit;
     }
         echo 'Error 13: The parameter password is required.';
         exit;
     }