diff --git a/.github/workflows/create_new_tag.yml b/.github/workflows/create_new_tag.yml index 2b4f15d..7572f4f 100644 --- a/.github/workflows/create_new_tag.yml +++ b/.github/workflows/create_new_tag.yml @@ -18,7 +18,7 @@ jobs: git fetch --tags - name: Check if tag does not exist, and generate/push one run: | - TAG_NAME=$(grep "/tmp/version" simplerisk-minimal/php81/Dockerfile | cut -d ' ' -f 6) + TAG_NAME=$(grep "ENV version" simplerisk-minimal/Dockerfile | cut -d '=' -f 2) if ! git rev-parse "$TAG_NAME" >/dev/null 2>&1; then git tag -a $TAG_NAME -m "SimpleRisk $TAG_NAME Release" fi diff --git a/.github/workflows/push-to-dockerhub.yml b/.github/workflows/push-to-dockerhub.yml index eab467d..62cf60e 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/Dockerfile" image_name: "simplerisk/simplerisk" - version: "20250411-001" + version: "20250731-001" os_version: "jammy" build_args: "ubuntu_version_code=jammy" secrets: inherit @@ -31,7 +31,7 @@ jobs: context_path: "simplerisk" dockerfile_path: "simplerisk/Dockerfile" image_name: "simplerisk/simplerisk" - version: "20250411-001" + version: "20250731-001" os_version: "noble" main_image: true build_args: "ubuntu_version_code=noble" @@ -43,7 +43,7 @@ jobs: context_path: "simplerisk-minimal" dockerfile_path: "simplerisk-minimal/Dockerfile" image_name: "simplerisk/simplerisk-minimal" - version: "20250411-001" + version: "20250731-001" os_version: "php81" build_args: "php_version=8.1" secrets: inherit @@ -54,7 +54,7 @@ jobs: context_path: "simplerisk-minimal" dockerfile_path: "simplerisk-minimal/Dockerfile" image_name: "simplerisk/simplerisk-minimal" - version: "20250411-001" + version: "20250731-001" os_version: "php83" main_image: true build_args: "php_version=8.3" diff --git a/.github/workflows/push-to-gh-pkgs.yml b/.github/workflows/push-to-gh-pkgs.yml index 230e308..25bb174 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/Dockerfile" image_name: "simplerisk" - version: "20250411-001" + version: "20250731-001" os_version: "jammy" build_args: "ubuntu_version_code=jammy" secrets: inherit @@ -31,7 +31,7 @@ jobs: context_path: "simplerisk" dockerfile_path: "simplerisk/Dockerfile" image_name: "simplerisk" - version: "20250411-001" + version: "20250731-001" os_version: "noble" main_image: true build_args: "ubuntu_version_code=noble" @@ -43,7 +43,7 @@ jobs: context_path: "simplerisk-minimal" dockerfile_path: "simplerisk-minimal/Dockerfile" image_name: "simplerisk-minimal" - version: "20250411-001" + version: "20250731-001" os_version: "php81" build_args: "php_version=8.1" secrets: inherit @@ -54,7 +54,7 @@ jobs: context_path: "simplerisk-minimal" dockerfile_path: "simplerisk-minimal/Dockerfile" image_name: "simplerisk-minimal" - version: "20250411-001" + version: "20250731-001" os_version: "php83" main_image: true build_args: "php_version=8.3" diff --git a/simplerisk-minimal/Dockerfile b/simplerisk-minimal/Dockerfile index 0648451..08d0c6a 100644 --- a/simplerisk-minimal/Dockerfile +++ b/simplerisk-minimal/Dockerfile @@ -6,13 +6,13 @@ FROM alpine/curl:8.12.1 AS downloader SHELL [ "/bin/ash", "-eo", "pipefail", "-c" ] RUN mkdir -p /var/www && \ - curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20250411-001.tgz | tar xz -C /var/www + curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20250731-001.tgz | tar xz -C /var/www FROM php:${php_version}-apache LABEL maintainer="SimpleRisk " -ENV version=20250411-001 +ENV version=20250731-001 WORKDIR /var/www diff --git a/simplerisk-minimal/stack.yml b/simplerisk-minimal/stack.yml index 94f8f19..991c664 100644 --- a/simplerisk-minimal/stack.yml +++ b/simplerisk-minimal/stack.yml @@ -6,9 +6,9 @@ services: simplerisk: environment: - DB_SETUP=automatic - - DB_SETUP_PASS=4SH2r9NsYLbKDO2DiwOJd + - DB_SETUP_PASS=r_Md3dXNequDW_YD_wyAX - SIMPLERISK_DB_HOSTNAME=mysql - image: simplerisk/simplerisk-minimal:20250411-001 + image: simplerisk/simplerisk-minimal:20250731-001 ports: - "80:80" - "443:443" @@ -16,7 +16,7 @@ services: mysql: command: mysqld --sql_mode="NO_ENGINE_SUBSTITUTION" environment: - - MYSQL_ROOT_PASSWORD=4SH2r9NsYLbKDO2DiwOJd + - MYSQL_ROOT_PASSWORD=r_Md3dXNequDW_YD_wyAX image: mysql:8.0 smtp: diff --git a/simplerisk/Dockerfile b/simplerisk/Dockerfile index 82418dd..10d0bf5 100644 --- a/simplerisk/Dockerfile +++ b/simplerisk/Dockerfile @@ -8,13 +8,13 @@ ARG DB_LANG=en SHELL [ "/bin/ash", "-eo", "pipefail", "-c" ] RUN mkdir -p /var/www && \ - curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20250411-001.tgz | tar xz -C /var/www && \ - curl -sL "https://github.com/simplerisk/database/raw/master/simplerisk-$DB_LANG-20250411-001.sql" > /simplerisk.sql + curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20250731-001.tgz | tar xz -C /var/www && \ + curl -sL "https://github.com/simplerisk/database/raw/master/simplerisk-$DB_LANG-20250731-001.sql" > /simplerisk.sql # Using Ubuntu image FROM ubuntu:${ubuntu_version_code} -ENV version=20250411-001 +ENV version=20250731-001 # Maintained by SimpleRisk LABEL maintainer="Simplerisk "