From a2baf5fc10c0f158a7d167d7ab943deabed94abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=BCckemeyer?= <gero.lueckemeyer@hft-stuttgart.de>
Date: Wed, 7 Feb 2024 16:10:34 +0100
Subject: [PATCH] changed compose config from legacy dtt to dta
---
ifc/generic-proxy/conf/nginx.conf | 4 ++--
ifc/generic-proxy/docker-compose.yaml | 26 +++++++++++++-------------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ifc/generic-proxy/conf/nginx.conf b/ifc/generic-proxy/conf/nginx.conf
index 0c31cff..7d7cb39 100644
--- a/ifc/generic-proxy/conf/nginx.conf
+++ b/ifc/generic-proxy/conf/nginx.conf
@@ -24,11 +24,11 @@ http {
proxy_cache_valid 200 302 1d;
proxy_cache_methods GET HEAD POST;
- proxy_pass http://backendcomposedtt:8080/v1/task;
+ proxy_pass http://backendcomposedta:8080/v1/task;
}
location /v1/unittest {
- proxy_pass http://backendcomposedtt:8080/v1/unittest;
+ proxy_pass http://backendcomposedta:8080/v1/unittest;
}
}
}
diff --git a/ifc/generic-proxy/docker-compose.yaml b/ifc/generic-proxy/docker-compose.yaml
index 2fae706..84e4b17 100644
--- a/ifc/generic-proxy/docker-compose.yaml
+++ b/ifc/generic-proxy/docker-compose.yaml
@@ -2,14 +2,14 @@ version: '2'
services:
services:
backend:
- container_name: backendcomposedtt
+ container_name: backendcomposedta
image: hftstuttgart/dta-backend:latest
user: "${EUSER}:${EGID}"
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- '/tmp/dta-tests:/tmp/dta-tests'
- mariadb-dtt:
- container_name: moodledb-dtt
+ mariadb-dta:
+ container_name: moodledb-dta
image: docker.io/bitnami/mariadb:11.1
environment:
# ALLOW_EMPTY_PASSWORD is recommended only for development.
@@ -19,25 +19,25 @@ services:
- MARIADB_CHARACTER_SET=utf8mb4
- MARIADB_COLLATE=utf8mb4_unicode_ci
volumes:
- - 'mariadb_data_dtt:/bitnami/mariadb'
- moodle-dtt:
- container_name: moodle-dtt
+ - 'mariadb_data_dta:/bitnami/mariadb'
+ moodle-dta:
+ container_name: moodle-dta
image: docker.io/bitnami/moodle:4.3
ports:
- '81:8080'
- '444:8443'
environment:
- - MOODLE_DATABASE_HOST=mariadb-dtt
+ - MOODLE_DATABASE_HOST=mariadb-dta
- MOODLE_DATABASE_PORT_NUMBER=3306
- MOODLE_DATABASE_USER=bn_moodle
- MOODLE_DATABASE_NAME=bitnami_moodle
# ALLOW_EMPTY_PASSWORD is recommended only for development.
- ALLOW_EMPTY_PASSWORD=yes
volumes:
- - 'moodle_data_dtt:/bitnami/moodle'
- - 'moodledata_data_dtt:/bitnami/moodledata'
+ - 'moodle_data_dta:/bitnami/moodle'
+ - 'moodledata_data_dta:/bitnami/moodledata'
depends_on:
- - mariadb-dtt
+ - mariadb-dta
cache:
container_name: cachedta
image: nginx:alpine
@@ -48,9 +48,9 @@ services:
depends_on:
- backend
volumes:
- mariadb_data_dtt:
+ mariadb_data_dta:
driver: local
- moodle_data_dtt:
+ moodle_data_dta:
driver: local
- moodledata_data_dtt:
+ moodledata_data_dta:
driver: local
--
GitLab