From 14a4b19cd735137e2420d113197538f74c7b1942 Mon Sep 17 00:00:00 2001 From: simplerisk-service Date: Mon, 19 Aug 2024 16:54:52 +0000 Subject: [PATCH] Updating Dockerfile versions (jenkins-simplerisk-code-development-testing-417) --- .github/workflows/push-to-dockerhub.yml | 8 ++++---- .github/workflows/push-to-gh-pkgs.yml | 8 ++++---- simplerisk-minimal/php81/Dockerfile | 4 ++-- simplerisk-minimal/php83/Dockerfile | 4 ++-- simplerisk/jammy/Dockerfile | 6 +++--- simplerisk/noble/Dockerfile | 6 +++--- stack.yml | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/push-to-dockerhub.yml b/.github/workflows/push-to-dockerhub.yml index 031d0c5..92ecca4 100644 --- a/.github/workflows/push-to-dockerhub.yml +++ b/.github/workflows/push-to-dockerhub.yml @@ -20,7 +20,7 @@ jobs: context_path: "simplerisk" dockerfile_path: "simplerisk/jammy/Dockerfile" image_name: "simplerisk/simplerisk" - version: "20240818-001" + version: "20240819-001" os_version: "jammy" secrets: inherit simplerisk-noble: @@ -30,7 +30,7 @@ jobs: context_path: "simplerisk" dockerfile_path: "simplerisk/noble/Dockerfile" image_name: "simplerisk/simplerisk" - version: "20240818-001" + version: "20240819-001" os_version: "noble" main_image: true secrets: inherit @@ -41,7 +41,7 @@ jobs: context_path: "simplerisk-minimal" dockerfile_path: "simplerisk-minimal/php81/Dockerfile" image_name: "simplerisk/simplerisk-minimal" - version: "20240818-001" + version: "20240819-001" os_version: "php81" secrets: inherit simplerisk-minimal-php83: @@ -51,7 +51,7 @@ jobs: context_path: "simplerisk-minimal" dockerfile_path: "simplerisk-minimal/php83/Dockerfile" image_name: "simplerisk/simplerisk-minimal" - version: "20240818-001" + version: "20240819-001" os_version: "php83" main_image: true secrets: inherit diff --git a/.github/workflows/push-to-gh-pkgs.yml b/.github/workflows/push-to-gh-pkgs.yml index 555544c..ad8f669 100644 --- a/.github/workflows/push-to-gh-pkgs.yml +++ b/.github/workflows/push-to-gh-pkgs.yml @@ -20,7 +20,7 @@ jobs: context_path: "simplerisk" dockerfile_path: "simplerisk/jammy/Dockerfile" image_name: "simplerisk" - version: "20240818-001" + version: "20240819-001" os_version: "jammy" secrets: inherit simplerisk-noble: @@ -30,7 +30,7 @@ jobs: context_path: "simplerisk" dockerfile_path: "simplerisk/noble/Dockerfile" image_name: "simplerisk" - version: "20240818-001" + version: "20240819-001" os_version: "noble" main_image: true secrets: inherit @@ -41,7 +41,7 @@ jobs: context_path: "simplerisk-minimal" dockerfile_path: "simplerisk-minimal/php81/Dockerfile" image_name: "simplerisk-minimal" - version: "20240818-001" + version: "20240819-001" os_version: "php81" secrets: inherit simplerisk-minimal-php83: @@ -51,7 +51,7 @@ jobs: context_path: "simplerisk-minimal" dockerfile_path: "simplerisk-minimal/php83/Dockerfile" image_name: "simplerisk-minimal" - version: "20240818-001" + version: "20240819-001" os_version: "php83" main_image: true secrets: inherit diff --git a/simplerisk-minimal/php81/Dockerfile b/simplerisk-minimal/php81/Dockerfile index 0b9bf7a..ab806fa 100644 --- a/simplerisk-minimal/php81/Dockerfile +++ b/simplerisk-minimal/php81/Dockerfile @@ -73,8 +73,8 @@ RUN echo 'upload_max_filesize = 5M' >> /usr/local/etc/php/conf.d/docker-php-uplo # Download and extract SimpleRisk, plus saving release version for database reference RUN rm -rf /var/www/html && \ - curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20240818-001.tgz | tar xz -C /var/www && \ - echo 20240818-001 > /tmp/version + curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20240819-001.tgz | tar xz -C /var/www && \ + echo 20240819-001 > /tmp/version # Creating Simplerisk user on www-data group and setting up ownerships RUN useradd -G www-data simplerisk && \ diff --git a/simplerisk-minimal/php83/Dockerfile b/simplerisk-minimal/php83/Dockerfile index cc3a628..2237f05 100644 --- a/simplerisk-minimal/php83/Dockerfile +++ b/simplerisk-minimal/php83/Dockerfile @@ -73,8 +73,8 @@ RUN echo 'upload_max_filesize = 5M' >> /usr/local/etc/php/conf.d/docker-php-uplo # Download and extract SimpleRisk, plus saving release version for database reference RUN rm -rf /var/www/html && \ - curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20240818-001.tgz | tar xz -C /var/www && \ - echo 20240818-001 > /tmp/version + curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20240819-001.tgz | tar xz -C /var/www && \ + echo 20240819-001 > /tmp/version # Creating Simplerisk user on www-data group and setting up ownerships RUN useradd -G www-data simplerisk && \ diff --git a/simplerisk/jammy/Dockerfile b/simplerisk/jammy/Dockerfile index 232f59a..c5a4d9f 100644 --- a/simplerisk/jammy/Dockerfile +++ b/simplerisk/jammy/Dockerfile @@ -79,12 +79,12 @@ RUN phpenmod ldap && \ sed -i 's/\(ServerSignature\) On/\1 Off/g' /etc/apache2/conf-enabled/security.conf RUN echo %sudo ALL=NOPASSWD: ALL >> /etc/sudoers && \ - echo "20240818-001" > /tmp/version + echo "20240819-001" > /tmp/version # Download SimpleRisk RUN rm -rf /var/www/html && \ - curl -sL https://github.com/simplerisk/database/raw/master/simplerisk-en-20240818-001.sql > /simplerisk.sql && \ - curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20240818-001.tgz | tar xz -C /var/www + curl -sL https://github.com/simplerisk/database/raw/master/simplerisk-en-20240819-001.sql > /simplerisk.sql && \ + curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20240819-001.tgz | tar xz -C /var/www # Permissions RUN chown -R www-data: /var/www/simplerisk diff --git a/simplerisk/noble/Dockerfile b/simplerisk/noble/Dockerfile index 5dfb5d1..a6cd7e8 100644 --- a/simplerisk/noble/Dockerfile +++ b/simplerisk/noble/Dockerfile @@ -79,12 +79,12 @@ RUN phpenmod ldap && \ sed -i 's/\(ServerSignature\) On/\1 Off/g' /etc/apache2/conf-enabled/security.conf RUN echo %sudo ALL=NOPASSWD: ALL >> /etc/sudoers && \ - echo "20240818-001" > /tmp/version + echo "20240819-001" > /tmp/version # Download SimpleRisk RUN rm -rf /var/www/html && \ - curl -sL https://github.com/simplerisk/database/raw/master/simplerisk-en-20240818-001.sql > /simplerisk.sql && \ - curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20240818-001.tgz | tar xz -C /var/www + curl -sL https://github.com/simplerisk/database/raw/master/simplerisk-en-20240819-001.sql > /simplerisk.sql && \ + curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20240819-001.tgz | tar xz -C /var/www # Permissions RUN chown -R www-data: /var/www/simplerisk diff --git a/stack.yml b/stack.yml index 69faa90..a8d2def 100644 --- a/stack.yml +++ b/stack.yml @@ -6,9 +6,9 @@ services: simplerisk: environment: - DB_SETUP=automatic - - DB_SETUP_PASS=m7pmEolBOuosuCWLYJ0kZ + - DB_SETUP_PASS=yf5RZRAXlVHoSiYUd7kl_ - SIMPLERISK_DB_HOSTNAME=mysql - image: simplerisk/simplerisk-minimal:20240818-001 + image: simplerisk/simplerisk-minimal:20240819-001 ports: - "80:80" - "443:443" @@ -16,7 +16,7 @@ services: mariadb: command: mysqld --sql_mode="NO_ENGINE_SUBSTITUTION" environment: - - MYSQL_ROOT_PASSWORD=m7pmEolBOuosuCWLYJ0kZ + - MYSQL_ROOT_PASSWORD=yf5RZRAXlVHoSiYUd7kl_ image: mysql:8.0 smtp: