Merge branch 'stable/12' into dev

compose/docker-compose.control.yml

@@ -14,7 +14,7 @@ services:
     environment:
       PGDATA: /var/lib/postgresql/data
     volumes:
-      - "pgdata:/var/lib/postgresql/data"
+      - "${PGDATA:-pgdata}:/var/lib/postgresql/data"
       - "./control:/control"
     entrypoint: ["/control/upgrade/entrypoint.sh"]
   backup:
@@ -25,8 +25,8 @@ services:
       PGDATA: /var/lib/postgresql/data
       OPDATA: /var/openproject/assets
     volumes:
-      - "pgdata:/var/lib/postgresql/data"
-      - "opdata:/var/openproject/assets"
+      - "${PGDATA:-pgdata}:/var/lib/postgresql/data"
+      - "${OPDATA:-opdata}:/var/openproject/assets"
       - "./backups:/backups"
       - "./control:/control"
     entrypoint: ["/control/backup/entrypoint.sh"]

compose/docker-compose.yml

@@ -25,7 +25,7 @@ x-op-app: &app
     # set to true to enable the email receiving feature. See ./docker/cron for more options
     IMAP_ENABLED: "${IMAP_ENABLED:-false}"
   volumes:
-    - "opdata:/var/openproject/assets"
+    - "${OPDATA:-opdata}:/var/openproject/assets"
 
 services:
   db:
@@ -33,9 +33,9 @@ services:
     <<: *restart_policy
     stop_grace_period: "3s"
     volumes:
-      - "pgdata:/var/lib/postgresql/data"
+      - "${PGDATA:-pgdata}:/var/lib/postgresql/data"
     environment:
-      POSTGRES_PASSWORD: p4ssw0rd
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-p4ssw0rd}
       POSTGRES_DB: openproject
     networks:
       - backend
@@ -73,7 +73,7 @@ services:
     labels:
       - autoheal=true
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8080/health_checks/default"]
+      test: ["CMD", "curl", "-f", "http://localhost:8080${OPENPROJECT_RAILS__RELATIVE__URL__ROOT:-}/health_checks/default"]
       interval: 10s
       timeout: 3s
       retries: 3
@@ -112,3 +112,4 @@ services:
     restart: on-failure
     networks:
       - backend
+

kubernetes/04-seeder-pod.yaml

@@ -24,7 +24,7 @@ spec:
         - name: RAILS_MIN_THREADS
           value: "4"
         - name: OPENPROJECT_EDITION
-          value: classic
+          value: standard
       image: openproject/community:12
       name: seeder
       resources: {}

kubernetes/05-web-deployment.yaml

@@ -36,7 +36,7 @@ spec:
             - name: RAILS_MIN_THREADS
               value: "4"
             - name: OPENPROJECT_EDITION
-              value: classic
+              value: standard
           image: openproject/community:12
           ports:
             - containerPort: 8080

kubernetes/05-worker-deployment.yaml

@@ -35,7 +35,7 @@ spec:
             - name: RAILS_MIN_THREADS
               value: "4"
             - name: OPENPROJECT_EDITION
-              value: classic
+              value: standard
           image: openproject/community:12
           name: worker
           resources: {}