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
2 changes: 1 addition & 1 deletion .github/workflows/create_new_tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
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: "20250411-001"
version: "20250731-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: "20250411-001"
version: "20250731-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: "20250411-001"
version: "20250731-001"
os_version: "php81"
build_args: "php_version=8.1"
secrets: inherit
Expand All @@ -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"
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: "20250411-001"
version: "20250731-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: "20250411-001"
version: "20250731-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: "20250411-001"
version: "20250731-001"
os_version: "php81"
build_args: "php_version=8.1"
secrets: inherit
Expand All @@ -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"
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-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 <support@simplerisk.com>"

ENV version=20250411-001
ENV version=20250731-001

WORKDIR /var/www

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=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"

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:
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-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 <support@simplerisk.com>"
Expand Down