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: "20260422-001"
version: "20260519-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: "20260422-001"
version: "20260519-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: "20260422-001"
version: "20260519-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: "20260422-001"
version: "20260519-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: "20260422-001"
version: "20260519-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: "20260422-001"
version: "20260519-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: "20260422-001"
version: "20260519-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: "20260422-001"
version: "20260519-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 @@ -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-20260422-001.tgz | tar xz -C /var/www
curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20260519-001.tgz | tar xz -C /var/www

FROM php:${php_version}-apache

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

ENV version=20260422-001
ENV version=20260519-001

WORKDIR /var/www

Expand Down
104 changes: 44 additions & 60 deletions simplerisk-minimal/README.md

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion simplerisk-minimal/common/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,14 @@ validate_db_setup(){
print_log "initial_info:setup" "Setting database through the automatic process";;
automatic-only)
print_log "initial_info:setup" "Setting database through the automatic process and removing container";;
manual)
print_log "initial_info:setup" "Database will be set manually";;
delete)
print_log "initial_info:setup" "Perform deletion of database";;
"")
print_log "initial_info:setup" "Database is already set";;
*)
fatal_error "The provided option for DB_SETUP is invalid. It must be automatic, automatic-only or delete.";;
fatal_error "The provided option for DB_SETUP is invalid. It must be automatic, automatic-only or manual.";;
esac
}

Expand Down
6 changes: 3 additions & 3 deletions simplerisk-minimal/stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ services:
simplerisk:
environment:
- DB_SETUP=automatic
- DB_SETUP_PASS=sl0EXIGhIemuuNHKdN4yY
- DB_SETUP_PASS=Q29xIQhisPq8rDzjbzZKd
- SIMPLERISK_DB_HOSTNAME=mysql
image: simplerisk/simplerisk-minimal:20260422-001
image: simplerisk/simplerisk-minimal:20260519-001
ports:
- "80:80"
- "443:443"

mysql:
command: mysqld --sql_mode="NO_ENGINE_SUBSTITUTION"
environment:
- MYSQL_ROOT_PASSWORD=sl0EXIGhIemuuNHKdN4yY
- MYSQL_ROOT_PASSWORD=Q29xIQhisPq8rDzjbzZKd
image: mysql:8.0

smtp:
Expand Down
6 changes: 3 additions & 3 deletions simplerisk/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-20260422-001.tgz | tar xz -C /var/www && \
curl -sL "https://github.com/simplerisk/database/raw/master/simplerisk-$DB_LANG-20260422-001.sql" > /simplerisk.sql
curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20260519-001.tgz | tar xz -C /var/www && \
curl -sL "https://github.com/simplerisk/database/raw/master/simplerisk-$DB_LANG-20260519-001.sql" > /simplerisk.sql

# Using Ubuntu image
FROM ubuntu:${ubuntu_version_code}

ENV version=20260422-001
ENV version=20260519-001

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