- github action checkout v3 -> v4

- github action setup-java v2 -> v4
MichiBaum · Dec 22, 2023 · a84675a · a84675a
1 parent 3687464
commit a84675a
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 12 deletions.
diff --git a/.env b/.env
@@ -1,3 +1,5 @@
+SPRING_ACTIVE_PROFILES=prod
+
 USERMANAGEMENT_DB_PASSWORD=PleaseChangeMe
 USERMANAGEMENT_DB=usermanagement
 

diff --git a/.env.override b/.env.override
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -10,9 +10,9 @@ jobs:
     name: 'Build, upload docker containers and deploy'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 21
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '21'

diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
@@ -7,11 +7,11 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Set up JDK 21
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '21'

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,55 +4,69 @@ services:
 
   registry-service:
     image: 70131370/registry-service:1.0.0-TEST-6
+    env_file:
+      - .env
+      - .env.override
     restart: always
     environment:
-      spring_profiles_active: prod
+      spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
     expose:
       - "8761"
     networks:
       - microservice-network
 
   admin-service:
     image: 70131370/admin-service:1.0.0-TEST-6
+    env_file:
+      - .env
+      - .env.override
     restart: always
     depends_on:
       - registry-service
     environment:
-      spring_profiles_active: prod
+      spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
     expose:
       - "80"
     networks:
       - microservice-network
 
   javadoc-service:
     image: 70131370/javadoc-service:1.0.0-TEST-6
+    env_file:
+      - .env
+      - .env.override
     restart: always
     depends_on:
       - registry-service
     environment:
-      spring_profiles_active: prod
+      spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
     expose:
       - "80"
     networks:
       - microservice-network
 
   authentication-service:
     image: 70131370/authentication-service:1.0.0-TEST-6
+    env_file:
+      - .env
+      - .env.override
     restart: always
     depends_on:
       - registry-service
     environment:
-      spring_profiles_active: prod
+      spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
     expose:
       - "80"
     networks:
       - microservice-network
 
   authentication-db:
     image: mysql:8.0
+    env_file:
+      - .env
+      - .env.override
     restart: always
     environment:
-      spring_profiles_active: prod
       MYSQL_ROOT_PASSWORD: ${AUTHENTICATION_DB_PASSWORD}
       MYSQL_DATABASE: ${AUTHENTICATION_DB}
     expose:
@@ -62,12 +76,15 @@ services:
 
   usermanagement-service:
     image: 70131370/usermanagement-service:1.0.0-TEST-6
+    env_file:
+      - .env
+      - .env.override
     restart: always
     depends_on:
       - registry-service
       - usermanagement-db
     environment:
-      spring_profiles_active: prod
+      spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
       DATABASE_PASSWORD: ${USERMANAGEMENT_DB_PASSWORD}
       DATABASE: ${USERMANAGEMENT_DB}
     expose:
@@ -77,9 +94,11 @@ services:
 
   usermanagement-db:
     image: mysql:8.0
+    env_file:
+      - .env
+      - .env.override
     restart: always
     environment:
-      spring_profiles_active: prod
       MYSQL_ROOT_PASSWORD: ${USERMANAGEMENT_DB_PASSWORD}
       MYSQL_DATABASE: ${USERMANAGEMENT_DB}
     expose:
@@ -89,6 +108,9 @@ services:
 
   gateway-service:
     image: 70131370/gateway-service:1.0.0-TEST-6
+    env_file:
+      - .env
+      - .env.override
     restart: always
     depends_on:
       - registry-service
@@ -99,7 +121,7 @@ services:
     ports:
       - "80:80"
     environment:
-      spring_profiles_active: prod
+      spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
     networks:
       - microservice-network
 

diff --git a/docker-down.sh b/docker-down.sh
@@ -0,0 +1 @@
+docker compose down
diff --git a/docker-up.sh b/docker-up.sh
@@ -0,0 +1 @@
+docker compose up --build -d
diff --git a/gateway-service/pom.xml b/gateway-service/pom.xml
@@ -13,6 +13,11 @@
 	<artifactId>gateway-service</artifactId>
 	<name>gateway-service</name>
 
+	<properties>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>