Update to Artemis 5.10.2

kit-sdq · Oct 7, 2022 · 30a0073 · 30a0073
1 parent dc6fc40
commit 30a0073
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 414 deletions.
diff --git a/.env b/.env
@@ -1,12 +1,8 @@
-ARTEMIS_VERSION=5.4.0
-ARTEMIS_GIT_REPOSITORY=https://github.com/kit-sdq/Artemis
-PROFILES=prod,jenkins,gitlab,artemis,scheduling,saml2
+ARTEMIS_VERSION=5.10.2
+GITLAB_VERSION=14.4.2-ce.0
 
-CUSTOM_PRIVACY_STATEMENT=./branding/privacy.html
-CUSTOM_IMPRINT=./branding/imprint.html
-CUSTOM_ABOUT=./branding/about-us.json
+PROFILES=prod,jenkins,gitlab,artemis,scheduling,saml2
 
 GITLAB_HTTP_PORT=8880
-GITLAB_HTTPS_PORT=8443
-GITLAB_SSH_PORT=2222
+GITLAB_SSH_PORT=222
 JENKINS_HTTP_PORT=7780
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Note: You can choose whether you want a full build: manual-build.yml or a fast b
 
 
 1. Clone the repository
-2. Run `docker-compose -f base.yml -f [fast-build.yml|manual-build.yml] up -d` and wait for the initial startup of the backend (config files will be copied). After that, stop the backend: `docker-compose -f base.yml -f [fast-build.yml|manual-build.yml] stop artemis-be`
+2. Run `docker compose up -d` and wait for the initial startup of the backend (config files will be copied). After that, stop the backend: `docker-compose stop artemis`
 3. Configure Artemis with Jenkins and Gilab as usual. Setup SAML using the configuration file as follows:
 
 The application-saml2.yml must look like that:
@@ -43,6 +43,6 @@ info.saml2.enable-password: true
 ```
 
 4. (Enable Debug output)
-5. Start the stack using ` docker-compose -f base.yml -f [fast-build.yml|manual-build.yml] up -d`
+5. Start the stack using ` docker-compose up -d`
 6. Log in with SAML2 using `user1` and `user1pass`
 7. User mail addresses are fixed, testing is in this configuration only possible when overwriting the user information in the SAML docker. 
diff --git a/defaults/templates/default.conf.template b/defaults/templates/default.conf.template
@@ -13,43 +13,39 @@ server {
    # Proxy API requests
    location /api {
       include /etc/nginx/proxy.conf;
-      proxy_pass http://artemis-be:8080/api;
+      proxy_pass http://artemis:8080/api;
    }
    location /management {
       include /etc/nginx/proxy.conf;
-      proxy_pass http://artemis-be:8080/management;
+      proxy_pass http://artemis:8080/management;
    }       
    location /v2 {
       include /etc/nginx/proxy.conf;
-      proxy_pass http://artemis-be:8080/v2;
+      proxy_pass http://artemis:8080/v2;
    }
    location /time {
       include /etc/nginx/proxy.conf;
-      proxy_pass http://artemis-be:8080/time;
+      proxy_pass http://artemis:8080/time;
    }
    location /saml2 {
       include /etc/nginx/proxy.conf;
-      proxy_pass http://artemis-be:8080/saml2;
+      proxy_pass http://artemis:8080/saml2;
    }
    location /login {
       include /etc/nginx/proxy.conf;
-      proxy_pass http://artemis-be:8080/login;
+      proxy_pass http://artemis:8080/login;
    }
 
    location /websocket {
       include /etc/nginx/proxy.conf;
-      proxy_pass http://artemis-be:8080/websocket;
+      proxy_pass http://artemis:8080/websocket;
       proxy_pass_header X-XSRF-TOKEN;
    }
 
 
    location / {
-      if (-f /sync/waiting-backend) {
-          return 200 '<html><head><title>Artemis is updating</title></head><meta content="15" http-equiv="refresh"/><body><b>Artemis is currently updating .. please try again in 5 min</b></body></html>';
-          add_header Content-Type text/html;
-      }
       include /etc/nginx/proxy.conf;
-      proxy_pass http://artemis-fe:80;
+      proxy_pass http://artemis:8080;
    }
 }
 
diff --git a/base.yml → docker-compose.yml b/base.yml → docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: '3.7'
 
 services:
   nginx:
@@ -9,13 +9,18 @@ services:
       - ./defaults/templates:/etc/nginx/templates
       - ./defaults/nginx.conf:/etc/nginx/nginx.conf
       - ./defaults/proxy.conf:/etc/nginx/proxy.conf
-      - ./.sync:/sync:ro
+    depends_on:
+      artemis:
+        condition: service_started
+      gitlab:
+        condition: service_started
+      jenkins:
+        condition: service_started
     ports:
       - "80:80"
     networks:
       - artemis-net
 
-
   saml:
     image: jamedjo/test-saml-idp
     hostname: saml
@@ -25,19 +30,20 @@ services:
       - ./saml/saml20-sp-remote.php:/var/www/simplesamlphp/metadata/saml20-sp-remote.php
       - ./saml/config.php:/var/www/simplesamlphp/config/config.php
     networks:
-      - artemis-net    
+      - artemis-net  
 
   gitlab:
     build:
       context: ./docker/gitlab
+      args:
+          GITLAB_VERSION: ${GITLAB_VERSION}
     restart: unless-stopped
     volumes:
       - ./data/gitlab/config:/etc/gitlab
       - ./data/gitlab/logs:/var/log/gitlab
       - ./data/gitlab/data:/var/opt/gitlab
     ports:
       - "${GITLAB_HTTP_PORT}:80"
-      - "${GITLAB_HTTPS_PORT}:443"
       - "${GITLAB_SSH_PORT}:22"
     environment:
       - GITLAB_OMNIBUS_CONFIG=prometheus_monitoring['enable'] = false; nginx['listen_port'] = 80; gitlab_rails['monitoring_whitelist'] = ['0.0.0.0/0']
@@ -59,24 +65,22 @@ services:
     networks:
       - artemis-net
 
-
-  artemis-be:
-    build:
-      context: ./docker/artemis-server
-      args:
-        ARTEMIS_VERSION: ${ARTEMIS_VERSION}
+  artemis:
+    image: ghcr.io/ls1intum/artemis:${ARTEMIS_VERSION}
     restart: unless-stopped
     depends_on:
-      - artemis-db
-      - gitlab
-      - jenkins
+      artemis-db:
+        condition: service_started
+      gitlab:
+        condition: service_healthy
+      jenkins:
+        condition: service_started
     volumes:
-      - ./data/artemis-be/config:/opt/Artemis/config
-      - ./data/artemis-be/data:/opt/Artemis/data
-      - ./.sync:/opt/Artemis/sync
+      - ./data/artemis-be/config:/opt/artemis/config
+      - ./data/artemis-be/data:/opt/artemis/data
+      - ./branding:/opt/artemis/public/content:ro
     environment:
-      - WAIT_FOR="gitlab:80"
-      - PROFILES=${PROFILES}
+      - spring.profiles.active=${PROFILES}
       - SPRING_DATASOURCE_URL=jdbc:mysql://artemis-db:3306/Artemis?createDatabaseIfNotExist=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
     networks:
       - artemis-net
@@ -95,24 +99,9 @@ services:
     cap_add:
       - SYS_NICE
 
-  artemis-fe:
-    build:
-      context: ./docker/artemis-client
-      args:
-        ARTEMIS_VERSION: ${ARTEMIS_VERSION}
-    restart: unless-stopped
-    depends_on:
-      - artemis-be
-    volumes:
-      - ${CUSTOM_PRIVACY_STATEMENT}:/usr/share/nginx/html/public/content/privacy_statement.html:ro
-      - ${CUSTOM_IMPRINT}:/usr/share/nginx/html/public/content/imprint.html:ro
-      - ${CUSTOM_ABOUT}:/usr/share/nginx/html/public/content/about-us.json:ro
-    environment:
-      - SERVER_NAME=localhost
-    networks:
-      - artemis-net
-
-
 networks:
   artemis-net:
-
+    ipam:
+      driver: default
+      config:
+        - subnet: 10.1.0.0/16
diff --git a/docker/artemis-client/Dockerfile.fast b/docker/artemis-client/Dockerfile.fast
diff --git a/docker/artemis-client/Dockerfile.manual b/docker/artemis-client/Dockerfile.manual
diff --git a/docker/artemis-client/defaults/artemis.conf.template b/docker/artemis-client/defaults/artemis.conf.template
diff --git a/docker/artemis-client/defaults/nginx.conf b/docker/artemis-client/defaults/nginx.conf
diff --git a/docker/artemis-server/Dockerfile.fast b/docker/artemis-server/Dockerfile.fast