Skip to content

Commit

Permalink
Merge pull request #101 from simplerisk/update-20240930-001
Browse files Browse the repository at this point in the history
SimpleRisk 20240930-001 Release
  • Loading branch information
jsokol authored Sep 30, 2024
2 parents d7afaa7 + 91e7f93 commit df43e9d
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
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/jammy/Dockerfile"
image_name: "simplerisk/simplerisk"
version: "20240927-001"
version: "20240930-001"
os_version: "jammy"
secrets: inherit
simplerisk-noble:
Expand All @@ -30,7 +30,7 @@ jobs:
context_path: "simplerisk"
dockerfile_path: "simplerisk/noble/Dockerfile"
image_name: "simplerisk/simplerisk"
version: "20240927-001"
version: "20240930-001"
os_version: "noble"
main_image: true
secrets: inherit
Expand All @@ -41,7 +41,7 @@ jobs:
context_path: "simplerisk-minimal"
dockerfile_path: "simplerisk-minimal/php81/Dockerfile"
image_name: "simplerisk/simplerisk-minimal"
version: "20240927-001"
version: "20240930-001"
os_version: "php81"
secrets: inherit
simplerisk-minimal-php83:
Expand All @@ -51,7 +51,7 @@ jobs:
context_path: "simplerisk-minimal"
dockerfile_path: "simplerisk-minimal/php83/Dockerfile"
image_name: "simplerisk/simplerisk-minimal"
version: "20240927-001"
version: "20240930-001"
os_version: "php83"
main_image: true
secrets: inherit
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/jammy/Dockerfile"
image_name: "simplerisk"
version: "20240927-001"
version: "20240930-001"
os_version: "jammy"
secrets: inherit
simplerisk-noble:
Expand All @@ -30,7 +30,7 @@ jobs:
context_path: "simplerisk"
dockerfile_path: "simplerisk/noble/Dockerfile"
image_name: "simplerisk"
version: "20240927-001"
version: "20240930-001"
os_version: "noble"
main_image: true
secrets: inherit
Expand All @@ -41,7 +41,7 @@ jobs:
context_path: "simplerisk-minimal"
dockerfile_path: "simplerisk-minimal/php81/Dockerfile"
image_name: "simplerisk-minimal"
version: "20240927-001"
version: "20240930-001"
os_version: "php81"
secrets: inherit
simplerisk-minimal-php83:
Expand All @@ -51,7 +51,7 @@ jobs:
context_path: "simplerisk-minimal"
dockerfile_path: "simplerisk-minimal/php83/Dockerfile"
image_name: "simplerisk-minimal"
version: "20240927-001"
version: "20240930-001"
os_version: "php83"
main_image: true
secrets: inherit
4 changes: 2 additions & 2 deletions simplerisk-minimal/php81/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-20240927-001.tgz | tar xz -C /var/www && \
echo 20240927-001 > /tmp/version
curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20240930-001.tgz | tar xz -C /var/www && \
echo 20240930-001 > /tmp/version

# Creating Simplerisk user on www-data group and setting up ownerships
RUN useradd -G www-data simplerisk && \
Expand Down
4 changes: 2 additions & 2 deletions simplerisk-minimal/php83/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-20240927-001.tgz | tar xz -C /var/www && \
echo 20240927-001 > /tmp/version
curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20240930-001.tgz | tar xz -C /var/www && \
echo 20240930-001 > /tmp/version

# Creating Simplerisk user on www-data group and setting up ownerships
RUN useradd -G www-data simplerisk && \
Expand Down
6 changes: 3 additions & 3 deletions simplerisk/jammy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 "20240927-001" > /tmp/version
echo "20240930-001" > /tmp/version

# Download SimpleRisk
RUN rm -rf /var/www/html && \
curl -sL https://github.com/simplerisk/database/raw/master/simplerisk-en-20240927-001.sql > /simplerisk.sql && \
curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20240927-001.tgz | tar xz -C /var/www
curl -sL https://github.com/simplerisk/database/raw/master/simplerisk-en-20240930-001.sql > /simplerisk.sql && \
curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20240930-001.tgz | tar xz -C /var/www

# Permissions
RUN chown -R www-data: /var/www/simplerisk
Expand Down
6 changes: 3 additions & 3 deletions simplerisk/noble/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 "20240927-001" > /tmp/version
echo "20240930-001" > /tmp/version

# Download SimpleRisk
RUN rm -rf /var/www/html && \
curl -sL https://github.com/simplerisk/database/raw/master/simplerisk-en-20240927-001.sql > /simplerisk.sql && \
curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20240927-001.tgz | tar xz -C /var/www
curl -sL https://github.com/simplerisk/database/raw/master/simplerisk-en-20240930-001.sql > /simplerisk.sql && \
curl -sL https://simplerisk-downloads.s3.amazonaws.com/public/bundles/simplerisk-20240930-001.tgz | tar xz -C /var/www

# Permissions
RUN chown -R www-data: /var/www/simplerisk
Expand Down
6 changes: 3 additions & 3 deletions 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=3PzussYmIughWD7BAxec1
- DB_SETUP_PASS=8Ex4zOj5Y44g-axlXoF_s
- SIMPLERISK_DB_HOSTNAME=mysql
image: simplerisk/simplerisk-minimal:20240927-001
image: simplerisk/simplerisk-minimal:20240930-001
ports:
- "80:80"
- "443:443"

mariadb:
command: mysqld --sql_mode="NO_ENGINE_SUBSTITUTION"
environment:
- MYSQL_ROOT_PASSWORD=3PzussYmIughWD7BAxec1
- MYSQL_ROOT_PASSWORD=8Ex4zOj5Y44g-axlXoF_s
image: mysql:8.0

smtp:
Expand Down

0 comments on commit df43e9d

Please sign in to comment.