Compare commits

..
4 Commits
Author SHA1 Message Date
p4u1 0623071756 feat: add enable_rauthy_sso command 2026-08-19 14:08:04 +02:00
Apfelwurm 1e16a607cc fix postgres healthcheck 2026-08-17 16:39:03 +02:00
javielico 7116066b52 chore: publish 4.1.1+7.1.2 release
continuous-integration/drone/tag Build is passing
2026-08-10 15:10:08 +01:00
javielico 8f7d69b3e5 chore: update image tags 2026-08-10 15:09:48 +01:00
3 changed files with 27 additions and 10 deletions
+20 -3
View File
@@ -3,11 +3,11 @@ export AUTO_WIZARD_VERSION=v2
export PG_BACKUP_VERSION=v2 export PG_BACKUP_VERSION=v2
get_setting_changes() { get_setting_changes() {
/custom-entrypoint.sh "bundle exec rails r 'puts JSON.pretty_generate(JSON.parse(Setting.all.select{ |setting| setting.state_current != setting.state_initial }.map { |setting| {name: setting.name, value: setting.state_current[\""value\""]} } .to_json))'" /custom-entrypoint.sh "rails r 'puts JSON.pretty_generate(JSON.parse(Setting.all.select{ |setting| setting.state_current != setting.state_initial }.map { |setting| {name: setting.name, value: setting.state_current[\""value\""]} } .to_json))'"
} }
console() { console() {
/custom-entrypoint.sh "bundle exec rails c" /custom-entrypoint.sh "rails c"
} }
rails_run() { rails_run() {
@@ -17,7 +17,7 @@ rails_run() {
init() { init() {
cp -f /opt/zammad/contrib/auto_wizard.json /tmp/auto_wizard.json cp -f /opt/zammad/contrib/auto_wizard.json /tmp/auto_wizard.json
/custom-entrypoint.sh "bundle exec rake zammad:setup:auto_wizard[/tmp/auto_wizard.json]" /custom-entrypoint.sh "rails zammad:setup:auto_wizard[/tmp/auto_wizard.json]"
} }
enable_authentik_sso() { enable_authentik_sso() {
@@ -38,6 +38,23 @@ enable_authentik_sso() {
abra app cmd -T $DOMAIN zammad-railsserver rails_run "$(printf "%q " $COMMAND)" abra app cmd -T $DOMAIN zammad-railsserver rails_run "$(printf "%q " $COMMAND)"
} }
enable_rauthy_sso() {
COMMAND="
(u = User.find_by(id: 3)) && (u.login='$OID_ADMIN_UID') && u.save!;
Setting.set('auth_openid_connect', true);
Setting.set('auth_third_party_auto_link_at_inital_login', true);
Setting.set('auth_openid_connect_credentials', {
'display_name'=>'$ORGANIZATION',
'identifier'=>'$OID_SSO_IDENTIFIER',
'issuer'=>'$OID_SSO_ISSUER',
'uid_field'=>'$OID_SSO_UID_FIELD',
'scope'=>'$OID_SSO_SCOPES',
'pkce'=>'$OID_SSO_PKCE',
'callback_url'=>'$OID_SSO_CALLBACK_URL'})
"
abra app cmd -T $DOMAIN app rails_run "$(printf "%q " $COMMAND)"
}
set_logo() { set_logo() {
LOGO_PATH="$1" LOGO_PATH="$1"
abra app cp "$APP_NAME" "$LOGO_PATH" zammad-railsserver:/tmp/ abra app cp "$APP_NAME" "$LOGO_PATH" zammad-railsserver:/tmp/
+1 -1
View File
@@ -1,7 +1,7 @@
version: "3.8" version: "3.8"
services: services:
zammad-backup: zammad-backup:
image: ghcr.io/zammad/zammad:7.1.1 image: ghcr.io/zammad/zammad:7.1.2
command: ["zammad-backup"] command: ["zammad-backup"]
volumes: volumes:
- zammad-backup:/var/tmp/zammad - zammad-backup:/var/tmp/zammad
+6 -6
View File
@@ -45,7 +45,7 @@ x-shared:
SSO_PROVIDER_DOMAIN: SSO_PROVIDER_DOMAIN:
IDP_SSO_TARGET_URL: IDP_SSO_TARGET_URL:
IDP_SLO_SERVICE_URL: IDP_SLO_SERVICE_URL:
image: ghcr.io/zammad/zammad:7.1.1 image: ghcr.io/zammad/zammad:7.1.2
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
@@ -69,7 +69,7 @@ x-shared:
services: services:
zammad-elasticsearch: zammad-elasticsearch:
image: elasticsearch:9.4.3 image: elasticsearch:9.4.4
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
@@ -100,7 +100,7 @@ services:
zammad-memcached: zammad-memcached:
command: memcached -m 256M command: memcached -m 256M
image: memcached:1.6.42-alpine image: memcached:1.6.45-alpine
healthcheck: healthcheck:
test: 'echo "version" | nc -vn -w 1 127.0.0.1 11211' test: 'echo "version" | nc -vn -w 1 127.0.0.1 11211'
interval: 30s interval: 30s
@@ -134,7 +134,7 @@ services:
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect" - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
- "coop-cloud.${STACK_NAME}.version=4.1.0+7.1.1" - "coop-cloud.${STACK_NAME}.version=4.1.1+7.1.2"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8080"] test: ["CMD", "curl", "-f", "http://localhost:8080"]
@@ -168,7 +168,7 @@ services:
secrets: secrets:
- db_password - db_password
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "zammad"] test: ["CMD", "pg_isready", "-U", "zammad", "-d", "zammad_production"]
interval: 30s interval: 30s
timeout: 10s timeout: 10s
retries: 10 retries: 10
@@ -193,7 +193,7 @@ services:
memory: 2G memory: 2G
zammad-redis: zammad-redis:
image: redis:8.8.0-alpine image: redis:8.10.0-alpine
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure