Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/push-to-dockerhub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
context_path: "simplerisk"
dockerfile_path: "simplerisk/Dockerfile"
image_name: "simplerisk/simplerisk"
version: "20260519-001"
version: "20260820-001"
os_version: "jammy"
build_args: "ubuntu_version_code=jammy"
secrets: inherit
Expand All @@ -31,7 +31,7 @@ jobs:
context_path: "simplerisk"
dockerfile_path: "simplerisk/Dockerfile"
image_name: "simplerisk/simplerisk"
version: "20260519-001"
version: "20260820-001"
os_version: "noble"
main_image: true
build_args: "ubuntu_version_code=noble"
Expand All @@ -43,7 +43,7 @@ jobs:
context_path: "simplerisk-minimal"
dockerfile_path: "simplerisk-minimal/Dockerfile"
image_name: "simplerisk/simplerisk-minimal"
version: "20260519-001"
version: "20260820-001"
os_version: "php83"
build_args: "php_version=8.3"
platforms: linux/amd64,linux/arm64
Expand All @@ -55,7 +55,7 @@ jobs:
context_path: "simplerisk-minimal"
dockerfile_path: "simplerisk-minimal/Dockerfile"
image_name: "simplerisk/simplerisk-minimal"
version: "20260519-001"
version: "20260820-001"
os_version: "php84"
main_image: true
build_args: "php_version=8.4"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/push-to-gh-pkgs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
context_path: "simplerisk"
dockerfile_path: "simplerisk/Dockerfile"
image_name: "simplerisk"
version: "20260519-001"
version: "20260820-001"
os_version: "jammy"
build_args: "ubuntu_version_code=jammy"
secrets: inherit
Expand All @@ -31,7 +31,7 @@ jobs:
context_path: "simplerisk"
dockerfile_path: "simplerisk/Dockerfile"
image_name: "simplerisk"
version: "20260519-001"
version: "20260820-001"
os_version: "noble"
main_image: true
build_args: "ubuntu_version_code=noble"
Expand All @@ -43,7 +43,7 @@ jobs:
context_path: "simplerisk-minimal"
dockerfile_path: "simplerisk-minimal/Dockerfile"
image_name: "simplerisk-minimal"
version: "20260519-001"
version: "20260820-001"
os_version: "php83"
build_args: "php_version=8.3"
secrets: inherit
Expand All @@ -54,7 +54,7 @@ jobs:
context_path: "simplerisk-minimal"
dockerfile_path: "simplerisk-minimal/Dockerfile"
image_name: "simplerisk-minimal"
version: "20260519-001"
version: "20260820-001"
os_version: "php84"
main_image: true
build_args: "php_version=8.4"
Expand Down
4 changes: 2 additions & 2 deletions simplerisk-minimal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ SHELL [ "/bin/ash", "-eo", "pipefail", "-c" ]
# updates feed, then extract -- fail-closed unless PREGA_BUNDLE_FALLBACK allows the
# pre-GA path. See common/download_and_verify_bundle.sh.
COPY common/download_and_verify_bundle.sh /download_and_verify_bundle.sh
RUN PREGA_BUNDLE_FALLBACK="$PREGA_BUNDLE_FALLBACK" sh /download_and_verify_bundle.sh 20260519-001
RUN PREGA_BUNDLE_FALLBACK="$PREGA_BUNDLE_FALLBACK" sh /download_and_verify_bundle.sh 20260820-001

FROM php:${php_version}-apache

LABEL maintainer="SimpleRisk <support@simplerisk.com>"

ENV version=20260519-001
ENV version=20260820-001

WORKDIR /var/www

Expand Down
2 changes: 1 addition & 1 deletion simplerisk-minimal/stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
- DB_SETUP=automatic
- DB_SETUP_PASS=simplerisk_setup
- SIMPLERISK_DB_HOSTNAME=mysql
image: simplerisk/simplerisk-minimal:20260519-001
image: simplerisk/simplerisk-minimal:20260820-001
ports:
- "80:80"
- "443:443"
Expand Down
6 changes: 3 additions & 3 deletions simplerisk/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ SHELL [ "/bin/ash", "-eo", "pipefail", "-c" ]
# -fsSL on the SQL fetch too: without --fail, curl writes the 404 body into
# /simplerisk.sql and the image ships an HTML error page as its schema.
COPY common/download_and_verify_bundle.sh /download_and_verify_bundle.sh
RUN PREGA_BUNDLE_FALLBACK="$PREGA_BUNDLE_FALLBACK" sh /download_and_verify_bundle.sh 20260519-001 && \
curl -fsSL "https://github.com/simplerisk/database/raw/master/simplerisk-$DB_LANG-20260519-001.sql" > /simplerisk.sql
RUN PREGA_BUNDLE_FALLBACK="$PREGA_BUNDLE_FALLBACK" sh /download_and_verify_bundle.sh 20260820-001 && \
curl -fsSL "https://github.com/simplerisk/database/raw/master/simplerisk-$DB_LANG-20260820-001.sql" > /simplerisk.sql

# Using Ubuntu image
FROM ubuntu:${ubuntu_version_code}

ENV version=20260519-001
ENV version=20260820-001

# Maintained by SimpleRisk
LABEL maintainer="Simplerisk <support@simplerisk.com>"
Expand Down