From 94b16a1eafea53d4a5210e9fc56a2f973b230334 Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 15:30:29 +0800 Subject: [PATCH 1/7] 2003 --- apps/webmin/.env | 16 +++++++++--- apps/webmin/docker-compose.yml | 4 +-- apps/webmin/variables.json | 8 ------ apps/zabbix/.env | 21 ++++++++------- apps/zabbix/docker-compose.yml | 44 +++++++++++++++---------------- apps/zabbix/variables.json | 9 +------ apps/zammad/.env | 15 +++++++---- apps/zammad/docker-compose.yml | 48 +++++++++++++++++----------------- apps/zammad/variables.json | 9 +------ 9 files changed, 83 insertions(+), 91 deletions(-) diff --git a/apps/webmin/.env b/apps/webmin/.env index 35a7c3410..415cf87df 100644 --- a/apps/webmin/.env +++ b/apps/webmin/.env @@ -1,8 +1,16 @@ W9_POWER_PASSWO=uQ8E1wVTzG8SOk3! -W9_NAME=webmin W9_VERSION=latest -W9_USER=root -W9_PASSWORD=$W9_POWER_PASSWO +W9_ID=webmin +W9_REPO=websoft9dev/webmin +#### -- Not allowed to edit below environments when recreate app based on existing data -- #### +W9_HTTP_PORT=1234 +W9_HTTP_PORT_SET=1234 + W9_NETWORK=websoft9 + +W9_USER=root W9_URL_REPLACE=false -W9_URL=appname.example.com \ No newline at end of file +W9_PASSWORD=$W9_POWER_PASSWO +W9_URL=appname.example.com +W9_DIST=community +#### --------------------------------------------------------------------------------------- #### \ No newline at end of file diff --git a/apps/webmin/docker-compose.yml b/apps/webmin/docker-compose.yml index 6173f92fb..6f950bb07 100644 --- a/apps/webmin/docker-compose.yml +++ b/apps/webmin/docker-compose.yml @@ -5,8 +5,8 @@ version: '3.8' services: webmin: - image: websoft9dev/webmin:${W9_VERSION} - container_name: ${W9_NAME} + image: ${W9_REPO}:${W9_VERSION} + container_name: ${W9_ID} env_file: .env environment: - WEBMIN_PASSWORD=${W9_PASSWORD} diff --git a/apps/webmin/variables.json b/apps/webmin/variables.json index ec7bb41fd..60d57b9be 100644 --- a/apps/webmin/variables.json +++ b/apps/webmin/variables.json @@ -7,14 +7,6 @@ { "dist": "community", "version": [ - "2.2", - "latest" - ] - }, - { - "dist": "enterprise", - "version": [ - "1.8.2", "latest" ] } diff --git a/apps/zabbix/.env b/apps/zabbix/.env index 368f871b2..2976fc91a 100644 --- a/apps/zabbix/.env +++ b/apps/zabbix/.env @@ -2,17 +2,18 @@ W9_POWER_PASSWO=uQ8E1wVTzG8SOk3! # 6.0 5.4 5.2 5.0 4.0 3.0 W9_VERSION=6.2 -W9_HTTP_PORT=9001 -W9_NAME=zabbix +W9_ID=zabbix + +W9_REPO= +#### -- Not allowed to edit below environments when recreate app based on existing data -- #### +W9_HTTP_PORT=8080 +W9_HTTP_PORT_SET=9001 + +W9_NETWORK=websoft9 W9_USER=Admin W9_PASSWORD=$W9_POWER_PASSWO -W9_NETWORK=websoft9 W9_URL_REPLACE=false W9_URL=appname.example.com -W9_DB_MYSQL_VERSION=8.0 -W9_DB_MYSQL_PORT=3306 -W9_DB_MYSQL_PASSWORD=$W9_POWER_PASSWO - -# Do not change the database name, which will result in a connection being refused -W9_DB_MYSQL_NAME=zabbix -W9_DB_MYSQL_USER=zabbix +W9_DIST=community +W9_DB_EXPOSE="mysql" +#### --------------------------------------------------------------------------------------- #### \ No newline at end of file diff --git a/apps/zabbix/docker-compose.yml b/apps/zabbix/docker-compose.yml index bd206052d..31eeafec3 100644 --- a/apps/zabbix/docker-compose.yml +++ b/apps/zabbix/docker-compose.yml @@ -6,7 +6,7 @@ version: '3.8' services: zabbix-server: image: zabbix/zabbix-server-mysql:ubuntu-${W9_VERSION}-latest - container_name: ${W9_NAME}-server + container_name: ${W9_ID}-server restart: unless-stopped ports: - "10051:10051" @@ -38,11 +38,11 @@ services: env_file: - ./src/env_vars/.env_srv environment: - - DB_SERVER_HOST=$W9_NAME-db + - DB_SERVER_HOST=$W9_ID-mysql - DB_SERVER_PORT=${W9_DB_MYSQL_PORT} - - MYSQL_ROOT_PASSWORD=${W9_DB_MYSQL_PASSWORD} - - MYSQL_PASSWORD=${W9_DB_MYSQL_PASSWORD} - - MYSQL_DATABASE=${W9_DB_MYSQL_NAME} + - MYSQL_ROOT_PASSWORD=${W9_POWER_PASSWO} + - MYSQL_PASSWORD=${W9_POWER_PASSWO} + - MYSQL_DATABASE=${W9_ID} - W9_PASSWORD=${W9_PASSWORD} depends_on: - mysql @@ -68,10 +68,10 @@ services: zabbix-web-apache-mysql: image: zabbix/zabbix-web-apache-mysql:ubuntu-${W9_VERSION}-latest - container_name: ${W9_NAME}-web + container_name: ${W9_ID}-web restart: unless-stopped ports: - - "${W9_HTTP_PORT}:8080" + - "${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}" volumes: - /etc/localtime:/etc/localtime:ro - apache2:/etc/ssl/apache2:ro @@ -86,10 +86,10 @@ services: reservations: memory: 256M environment: - - DB_SERVER_HOST=$W9_NAME-db + - DB_SERVER_HOST=$W9_ID-mysql - DB_SERVER_PORT=${W9_DB_MYSQL_PORT} - - MYSQL_ROOT_PASSWORD=${W9_DB_MYSQL_PASSWORD} - - MYSQL_PASSWORD=${W9_DB_MYSQL_PASSWORD} + - MYSQL_ROOT_PASSWORD=${W9_POWER_PASSWO} + - MYSQL_PASSWORD=${W9_POWER_PASSWO} env_file: - ./src/env_vars/.env_web depends_on: @@ -114,7 +114,7 @@ services: zabbix-agent: image: zabbix/zabbix-agent:ubuntu-${W9_VERSION}-latest - container_name: ${W9_NAME}-agent + container_name: ${W9_ID}-agent restart: unless-stopped ports: - "10050:10050" @@ -147,7 +147,7 @@ services: zabbix-java-gateway: image: zabbix/zabbix-java-gateway:ubuntu-${W9_VERSION}-latest - container_name: ${W9_NAME}-java + container_name: ${W9_ID}-java restart: unless-stopped ports: - "10052:10052" @@ -168,7 +168,7 @@ services: zabbix-snmptraps: image: zabbix/zabbix-snmptraps:ubuntu-${W9_VERSION}-latest - container_name: ${W9_NAME}-snmptraps + container_name: ${W9_ID}-snmptraps restart: unless-stopped ports: - "162:1162/udp" @@ -186,13 +186,12 @@ services: com.zabbix.company: "Zabbix LLC" com.zabbix.component: "snmptraps" com.zabbix.os: "ubuntu" + env_file: .env mysql: - image: mysql:${W9_DB_MYSQL_VERSION} - container_name: ${W9_NAME}-db + image: mysql:8.0 + container_name: ${W9_ID}-mysql restart: unless-stopped - ports: - - ${W9_DB_MYSQL_PORT}:3306 command: - mysqld - --character-set-server=utf8mb4 @@ -201,18 +200,19 @@ services: volumes: - mysql:/var/lib/mysql:rw environment: - - DB_SERVER_HOST=$W9_NAME-db - - MYSQL_ROOT_PASSWORD=${W9_DB_MYSQL_PASSWORD} + - DB_SERVER_HOST=$W9_ID-mysql + - MYSQL_ROOT_PASSWORD=${W9_POWER_PASSWO} - DB_SERVER_PORT=${W9_DB_MYSQL_PORT} - - MYSQL_USER=${W9_DB_MYSQL_USER} - - MYSQL_PASSWORD=${W9_DB_MYSQL_PASSWORD} + - MYSQL_USER=${W9_ID} + - MYSQL_PASSWORD=${W9_POWER_PASSWO} security_opt: - seccomp:unconfined stop_grace_period: 1m + env_file: .env db_data_mysql: image: busybox - container_name: ${W9_NAME}-data + container_name: ${W9_ID}-data volumes: - mysql:/var/lib/mysql:rw diff --git a/apps/zabbix/variables.json b/apps/zabbix/variables.json index 0ae758adf..b4c24002a 100644 --- a/apps/zabbix/variables.json +++ b/apps/zabbix/variables.json @@ -7,14 +7,7 @@ { "dist": "community", "version": [ - "18.8", - "latest" - ] - }, - { - "dist": "enterprise", - "version": [ - "1.8.2", + "6.2", "latest" ] } diff --git a/apps/zammad/.env b/apps/zammad/.env index f6d503cc1..e4df1c05f 100644 --- a/apps/zammad/.env +++ b/apps/zammad/.env @@ -1,8 +1,13 @@ W9_POWER_PASSWO=UGz0IARz117ssO% -IMAGE_REPO=zammad/zammad-docker-compose -POSTGRES_PASS=$W9_POWER_PASSWO -POSTGRES_USER=zammad -RESTART=always +W9_ID=zammad # don't forget to add the minus before the version -VERSION=-4.1.0-6 +W9_VERSION=-4.1.0-6 +W9_REPO=zammad/zammad-docker-compose +#### -- Not allowed to edit below environments when recreate app based on existing data -- #### +W9_HTTP_PORT=1234 +W9_HTTP_PORT_SET=1234 + W9_NETWORK=websoft9 +W9_RESTART=always +W9_DIST=community +#### --------------------------------------------------------------------------------------- #### \ No newline at end of file diff --git a/apps/zammad/docker-compose.yml b/apps/zammad/docker-compose.yml index 4147d5097..6d1c21580 100644 --- a/apps/zammad/docker-compose.yml +++ b/apps/zammad/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2' +W9_VERSION: '2' services: @@ -10,12 +10,12 @@ services: environment: - BACKUP_SLEEP=86400 - HOLD_DAYS=10 - - POSTGRESQL_USER=${POSTGRES_USER} - - POSTGRESQL_PASSWORD=${POSTGRES_PASS} - image: ${IMAGE_REPO}:zammad-postgresql${VERSION} + - POSTGRESQL_USER=${W9_ID} + - POSTGRESQL_PASSWORD=${W9_POWER_PASSWO} + image: ${W9_REPO}:zammad-postgresql${W9_VERSION} links: - zammad-postgresql - restart: ${RESTART} + W9_RESTART: ${W9_RESTART} volumes: - zammad-backup:/var/tmp/zammad - zammad-data:/opt/zammad @@ -23,8 +23,8 @@ services: zammad-elasticsearch: environment: - discovery.type=single-node - image: ${IMAGE_REPO}:zammad-elasticsearch${VERSION} - restart: ${RESTART} + image: ${W9_REPO}:zammad-elasticsearch${W9_VERSION} + W9_RESTART: ${W9_RESTART} volumes: - elasticsearch-data:/usr/share/elasticsearch/data @@ -33,20 +33,20 @@ services: depends_on: - zammad-postgresql environment: - - POSTGRESQL_USER=${POSTGRES_USER} - - POSTGRESQL_PASS=${POSTGRES_PASS} - image: ${IMAGE_REPO}:zammad${VERSION} + - POSTGRESQL_USER=${W9_ID} + - POSTGRESQL_PASS=${W9_POWER_PASSWO} + image: ${W9_REPO}:zammad${W9_VERSION} links: - zammad-elasticsearch - zammad-postgresql - restart: on-failure + W9_RESTART: on-failure volumes: - zammad-data:/opt/zammad zammad-memcached: command: memcached -m 256M image: memcached:1.6.9-alpine - restart: ${RESTART} + W9_RESTART: ${W9_RESTART} zammad-nginx: command: ["zammad-nginx"] @@ -54,20 +54,20 @@ services: - "8080" depends_on: - zammad-railsserver - image: ${IMAGE_REPO}:zammad${VERSION} + image: ${W9_REPO}:zammad${W9_VERSION} links: - zammad-railsserver - zammad-websocket - restart: ${RESTART} + W9_RESTART: ${W9_RESTART} volumes: - zammad-data:/opt/zammad zammad-postgresql: environment: - - POSTGRES_USER=${POSTGRES_USER} - - POSTGRES_PASSWORD=${POSTGRES_PASS} - image: ${IMAGE_REPO}:zammad-postgresql${VERSION} - restart: ${RESTART} + - W9_ID=${W9_ID} + - W9_POWER_PASSWOWORD=${W9_POWER_PASSWO} + image: ${W9_REPO}:zammad-postgresql${W9_VERSION} + W9_RESTART: ${W9_RESTART} volumes: - postgresql-data:/var/lib/postgresql/data @@ -76,12 +76,12 @@ services: depends_on: - zammad-memcached - zammad-postgresql - image: ${IMAGE_REPO}:zammad${VERSION} + image: ${W9_REPO}:zammad${W9_VERSION} links: - zammad-elasticsearch - zammad-memcached - zammad-postgresql - restart: ${RESTART} + W9_RESTART: ${W9_RESTART} volumes: - zammad-data:/opt/zammad @@ -90,12 +90,12 @@ services: depends_on: - zammad-memcached - zammad-railsserver - image: ${IMAGE_REPO}:zammad${VERSION} + image: ${W9_REPO}:zammad${W9_VERSION} links: - zammad-elasticsearch - zammad-memcached - zammad-postgresql - restart: ${RESTART} + W9_RESTART: ${W9_RESTART} volumes: - zammad-data:/opt/zammad @@ -104,11 +104,11 @@ services: depends_on: - zammad-memcached - zammad-railsserver - image: ${IMAGE_REPO}:zammad${VERSION} + image: ${W9_REPO}:zammad${W9_VERSION} links: - zammad-postgresql - zammad-memcached - restart: ${RESTART} + W9_RESTART: ${W9_RESTART} volumes: - zammad-data:/opt/zammad diff --git a/apps/zammad/variables.json b/apps/zammad/variables.json index 4a46ef15d..90bbcfaa7 100644 --- a/apps/zammad/variables.json +++ b/apps/zammad/variables.json @@ -7,14 +7,7 @@ { "dist": "community", "version": [ - "2.2", - "latest" - ] - }, - { - "dist": "enterprise", - "version": [ - "1.8.2", + "-4.1.0-6", "latest" ] } From 422044304b529ab13fb8cd7410fd80b194f5d771 Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 15:47:57 +0800 Subject: [PATCH 2/7] webmin --- apps/webmin/.env | 4 ++-- apps/webmin/docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/webmin/.env b/apps/webmin/.env index 415cf87df..740a1dfde 100644 --- a/apps/webmin/.env +++ b/apps/webmin/.env @@ -3,8 +3,8 @@ W9_VERSION=latest W9_ID=webmin W9_REPO=websoft9dev/webmin #### -- Not allowed to edit below environments when recreate app based on existing data -- #### -W9_HTTP_PORT=1234 -W9_HTTP_PORT_SET=1234 +W9_HTTP_PORT=10000 +W9_HTTP_PORT_SET=10000 W9_NETWORK=websoft9 diff --git a/apps/webmin/docker-compose.yml b/apps/webmin/docker-compose.yml index 6f950bb07..ca3059eda 100644 --- a/apps/webmin/docker-compose.yml +++ b/apps/webmin/docker-compose.yml @@ -11,7 +11,7 @@ services: environment: - WEBMIN_PASSWORD=${W9_PASSWORD} ports: - - '10000:10000' + - '$W9_HTTP_PORT_SET:$W9_HTTP_PORT' restart: unless-stopped networks: From df2b4fa53d12cf4e71881e9c928b6548212f1553 Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 16:00:35 +0800 Subject: [PATCH 3/7] zabbix --- apps/zabbix/.env | 2 +- apps/zabbix/docker-compose.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/zabbix/.env b/apps/zabbix/.env index 2976fc91a..7eca6c446 100644 --- a/apps/zabbix/.env +++ b/apps/zabbix/.env @@ -4,7 +4,7 @@ W9_POWER_PASSWO=uQ8E1wVTzG8SOk3! W9_VERSION=6.2 W9_ID=zabbix -W9_REPO= +W9_REPO=zabbix/zabbix-web-apache-mysql #### -- Not allowed to edit below environments when recreate app based on existing data -- #### W9_HTTP_PORT=8080 W9_HTTP_PORT_SET=9001 diff --git a/apps/zabbix/docker-compose.yml b/apps/zabbix/docker-compose.yml index 31eeafec3..886a1e4d7 100644 --- a/apps/zabbix/docker-compose.yml +++ b/apps/zabbix/docker-compose.yml @@ -39,7 +39,7 @@ services: - ./src/env_vars/.env_srv environment: - DB_SERVER_HOST=$W9_ID-mysql - - DB_SERVER_PORT=${W9_DB_MYSQL_PORT} + - DB_SERVER_PORT=3306 - MYSQL_ROOT_PASSWORD=${W9_POWER_PASSWO} - MYSQL_PASSWORD=${W9_POWER_PASSWO} - MYSQL_DATABASE=${W9_ID} @@ -67,7 +67,7 @@ services: - source: my_cmd zabbix-web-apache-mysql: - image: zabbix/zabbix-web-apache-mysql:ubuntu-${W9_VERSION}-latest + image: ${W9_REPO}:ubuntu-${W9_VERSION}-latest container_name: ${W9_ID}-web restart: unless-stopped ports: @@ -87,7 +87,7 @@ services: memory: 256M environment: - DB_SERVER_HOST=$W9_ID-mysql - - DB_SERVER_PORT=${W9_DB_MYSQL_PORT} + - DB_SERVER_PORT=3306 - MYSQL_ROOT_PASSWORD=${W9_POWER_PASSWO} - MYSQL_PASSWORD=${W9_POWER_PASSWO} env_file: @@ -202,7 +202,7 @@ services: environment: - DB_SERVER_HOST=$W9_ID-mysql - MYSQL_ROOT_PASSWORD=${W9_POWER_PASSWO} - - DB_SERVER_PORT=${W9_DB_MYSQL_PORT} + - DB_SERVER_PORT=3306 - MYSQL_USER=${W9_ID} - MYSQL_PASSWORD=${W9_POWER_PASSWO} security_opt: From 0150785dc64b9b769c388965373e5c294377e3a6 Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 16:06:41 +0800 Subject: [PATCH 4/7] zammad --- apps/zammad/.env | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/zammad/.env b/apps/zammad/.env index e4df1c05f..528e54f65 100644 --- a/apps/zammad/.env +++ b/apps/zammad/.env @@ -4,8 +4,6 @@ W9_ID=zammad W9_VERSION=-4.1.0-6 W9_REPO=zammad/zammad-docker-compose #### -- Not allowed to edit below environments when recreate app based on existing data -- #### -W9_HTTP_PORT=1234 -W9_HTTP_PORT_SET=1234 W9_NETWORK=websoft9 W9_RESTART=always From e1c20c50f9e637c37d49ab9eefbad80752b3ebcf Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 16:09:46 +0800 Subject: [PATCH 5/7] zammad --- apps/zammad/docker-compose.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/zammad/docker-compose.yml b/apps/zammad/docker-compose.yml index 6d1c21580..0712966f1 100644 --- a/apps/zammad/docker-compose.yml +++ b/apps/zammad/docker-compose.yml @@ -15,7 +15,7 @@ services: image: ${W9_REPO}:zammad-postgresql${W9_VERSION} links: - zammad-postgresql - W9_RESTART: ${W9_RESTART} + RESTART: ${W9_RESTART} volumes: - zammad-backup:/var/tmp/zammad - zammad-data:/opt/zammad @@ -24,7 +24,7 @@ services: environment: - discovery.type=single-node image: ${W9_REPO}:zammad-elasticsearch${W9_VERSION} - W9_RESTART: ${W9_RESTART} + RESTART: ${W9_RESTART} volumes: - elasticsearch-data:/usr/share/elasticsearch/data @@ -39,14 +39,14 @@ services: links: - zammad-elasticsearch - zammad-postgresql - W9_RESTART: on-failure + RESTART: on-failure volumes: - zammad-data:/opt/zammad zammad-memcached: command: memcached -m 256M image: memcached:1.6.9-alpine - W9_RESTART: ${W9_RESTART} + RESTART: ${W9_RESTART} zammad-nginx: command: ["zammad-nginx"] @@ -58,7 +58,7 @@ services: links: - zammad-railsserver - zammad-websocket - W9_RESTART: ${W9_RESTART} + RESTART: ${W9_RESTART} volumes: - zammad-data:/opt/zammad @@ -67,7 +67,7 @@ services: - W9_ID=${W9_ID} - W9_POWER_PASSWOWORD=${W9_POWER_PASSWO} image: ${W9_REPO}:zammad-postgresql${W9_VERSION} - W9_RESTART: ${W9_RESTART} + RESTART: ${W9_RESTART} volumes: - postgresql-data:/var/lib/postgresql/data @@ -81,7 +81,7 @@ services: - zammad-elasticsearch - zammad-memcached - zammad-postgresql - W9_RESTART: ${W9_RESTART} + RESTART: ${W9_RESTART} volumes: - zammad-data:/opt/zammad @@ -95,7 +95,7 @@ services: - zammad-elasticsearch - zammad-memcached - zammad-postgresql - W9_RESTART: ${W9_RESTART} + RESTART: ${W9_RESTART} volumes: - zammad-data:/opt/zammad @@ -108,7 +108,7 @@ services: links: - zammad-postgresql - zammad-memcached - W9_RESTART: ${W9_RESTART} + RESTART: ${W9_RESTART} volumes: - zammad-data:/opt/zammad From a3a0b533fca0f8ae4d76c0b7738a010af35a7f1a Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 16:12:54 +0800 Subject: [PATCH 6/7] zammad --- apps/zammad/docker-compose.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/zammad/docker-compose.yml b/apps/zammad/docker-compose.yml index 0712966f1..eef97c598 100644 --- a/apps/zammad/docker-compose.yml +++ b/apps/zammad/docker-compose.yml @@ -15,7 +15,7 @@ services: image: ${W9_REPO}:zammad-postgresql${W9_VERSION} links: - zammad-postgresql - RESTART: ${W9_RESTART} + restart: ${W9_RESTART} volumes: - zammad-backup:/var/tmp/zammad - zammad-data:/opt/zammad @@ -24,7 +24,7 @@ services: environment: - discovery.type=single-node image: ${W9_REPO}:zammad-elasticsearch${W9_VERSION} - RESTART: ${W9_RESTART} + restart: ${W9_RESTART} volumes: - elasticsearch-data:/usr/share/elasticsearch/data @@ -39,14 +39,14 @@ services: links: - zammad-elasticsearch - zammad-postgresql - RESTART: on-failure + restart: on-failure volumes: - zammad-data:/opt/zammad zammad-memcached: command: memcached -m 256M image: memcached:1.6.9-alpine - RESTART: ${W9_RESTART} + restart: ${W9_RESTART} zammad-nginx: command: ["zammad-nginx"] @@ -58,7 +58,7 @@ services: links: - zammad-railsserver - zammad-websocket - RESTART: ${W9_RESTART} + restart: ${W9_RESTART} volumes: - zammad-data:/opt/zammad @@ -67,7 +67,7 @@ services: - W9_ID=${W9_ID} - W9_POWER_PASSWOWORD=${W9_POWER_PASSWO} image: ${W9_REPO}:zammad-postgresql${W9_VERSION} - RESTART: ${W9_RESTART} + restart: ${W9_RESTART} volumes: - postgresql-data:/var/lib/postgresql/data @@ -81,7 +81,7 @@ services: - zammad-elasticsearch - zammad-memcached - zammad-postgresql - RESTART: ${W9_RESTART} + restart: ${W9_RESTART} volumes: - zammad-data:/opt/zammad @@ -95,7 +95,7 @@ services: - zammad-elasticsearch - zammad-memcached - zammad-postgresql - RESTART: ${W9_RESTART} + restart: ${W9_RESTART} volumes: - zammad-data:/opt/zammad @@ -108,7 +108,7 @@ services: links: - zammad-postgresql - zammad-memcached - RESTART: ${W9_RESTART} + restart: ${W9_RESTART} volumes: - zammad-data:/opt/zammad From 0641a1ea5dbe71b1539b3c85b28d6031fb716746 Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 16:14:06 +0800 Subject: [PATCH 7/7] zammad --- apps/zammad/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/zammad/docker-compose.yml b/apps/zammad/docker-compose.yml index eef97c598..47d45bd09 100644 --- a/apps/zammad/docker-compose.yml +++ b/apps/zammad/docker-compose.yml @@ -1,4 +1,4 @@ -W9_VERSION: '2' +version: '2' services: