Merge remote-tracking branch 'aoe-semantic-apis/main'

Opetushallitus · Nov 25, 2024 · 493e5f7 · 493e5f7
2 parents 708676a + 088d668
commit 493e5f7
Show file tree

Hide file tree

Showing 10 changed files with 336 additions and 13,925 deletions.
diff --git a/aoe-semantic-apis/.gitlab-ci.yml b/aoe-semantic-apis/.gitlab-ci.yml
@@ -2,60 +2,47 @@ variables:
   DOCKER_HOST: unix:///var/run/docker.sock
   DOCKER_DRIVER: overlay2
 
-image:
-  name: docker/compose:1.29.2
-
-services:
-  - name: docker:dind
-    alias: docker
-
 stages:
   - build
   - deploy
   - cleanup
 
-before_script:
-  - docker version
-  - docker-compose version
-
-build_demo:
+build_test:
   stage: build
   script:
     - echo 'DEMO build'
-    - docker-compose -f docker-compose.prod.yml down
-    - docker-compose -f docker-compose.prod.yml build
+    - docker compose -f docker-compose.prod.yml build
   only:
     - dev
   tags:
-    - demo
+    - test-apps
 
-deploy_demo:
+deploy_test:
   stage: deploy
   script:
     - echo 'DEMO deploy'
-    - docker-compose -f docker-compose.prod.yml up -d
+    - docker compose -f docker-compose.prod.yml up -d
   only:
     - dev
   tags:
-    - demo
+    - test-apps
 
-cleanup_demo:
+cleanup_test:
   stage: cleanup
   script:
     - echo 'DEMO system clean up'
-    - docker system prune -a -f
+    - docker system prune -a -f --volumes
   only:
     - dev
   tags:
-    - demo
+    - test-apps
   when: manual
 
 build_prod:
   stage: build
   script:
     - echo 'DEMO build'
-    - docker-compose -f docker-compose.prod.yml down
-    - docker-compose -f docker-compose.prod.yml build
+    - docker compose -f docker-compose.prod.yml build
   only:
     - main
   tags:
@@ -65,7 +52,7 @@ deploy_prod:
   stage: deploy
   script:
     - echo 'DEMO deploy'
-    - docker-compose -f docker-compose.prod.yml up -d
+    - docker compose -f docker-compose.prod.yml up -d
   only:
     - main
   tags:
@@ -75,7 +62,7 @@ cleanup_prod:
   stage: cleanup
   script:
     - echo 'DEMO system clean up'
-    - docker system prune -a -f
+    - docker system prune -a -f --volumes
   only:
     - main
   tags:

diff --git a/aoe-semantic-apis/docker-compose.prod.yml b/aoe-semantic-apis/docker-compose.prod.yml
@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   aoe-semantic-apis:
     build:
@@ -9,7 +7,7 @@ services:
     container_name: aoe-semantic-apis
     restart: unless-stopped
     ports:
-      - "3000:3000"
+      - '3000:3000'
     environment:
       - NODE_ENV=production
     env_file: /environment/aoe-semantic-apis/.env