Introduces first CI script adaptation and Docker deployment to the new architecture and application versions

Author: diego-guerrero

.env

@@ -1,13 +1,13 @@
 SERVER_PORT=8080
 
 MYSQL_ROOT_PASSWORD=T4cwGK3q5NdR3vMz
-MYSQL_DATABASE=vscode4teach
+MYSQL_DATABASE=vscode4teaching
 
-SPRING_DATASOURCE_USERNAME=vscode4teach
+SPRING_DATASOURCE_USERNAME=vscode4teaching
 SPRING_DATASOURCE_PASSWORD=AvScnGQp5e4GHnd
-SPRING_DATASOURCE_URL=jdbc:mysql://db/vscode4teach?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
+SPRING_DATASOURCE_URL=jdbc:mysql://db/vscode4teaching?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
 
-JWT_SECRET=vscode4teaching
+JWT_SECRET=cUYw1eSNM6eyhcY2pg6G6Hvf5gHkhdEFr76bbP89dld6qdjfAktQNGqIE4fvKH8kHvf5gHkhdEFr76bbHvf5gHkhdEFr76bb
 
 V4T_FILEDIRECTORY=/app/v4t_courses
 

.github/workflows/README.md

@@ -1,7 +1,7 @@
 # VSCode4Teaching
 **Developer documentation on the Continuous Integration, Delivery and Deployment (*CI/CD*) system of this project**
 
-This project is configured with a continuous integration, deployment and delivery system through [GitHub Actions](https://github.com/features/actions). This system includes a single workflow that comprises both server and web application ([`server.ci.yml`](server.ci.yml)).
+This project is configured with a continuous integration, deployment and delivery system through [GitHub Actions](https://github.com/features/actions). This system includes a single workflow that comprises both server and web application ([`ci.yml`](ci.yml)).
 
 ### Detailed description of declared jobs
 The aforementioned files define the jobs that will be executed sequentially based on the type of changes registered in the repository. These jobs are:

.github/workflows/server.ci.yml renamed to .github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: "Server pipeline"
+name: "VSCode4Teaching pipeline"
 
 on:
   push:
@@ -17,14 +17,14 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./vscode4teaching-server
+        working-directory: ./backend
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
     - name: Set up Java version
       uses: actions/setup-java@v4
       with:
-        java-version: 11
+        java-version: 21
         distribution: temurin
     - name: Test
       run: ./mvnw clean dependency:resolve test
@@ -41,7 +41,7 @@ jobs:
         run: |
           VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
           echo VERSION=$VERSION >> $GITHUB_ENV
-        working-directory: ./vscode4teaching-server
+        working-directory: ./backend
       - name: Build Docker image
         run: |
           env | grep DOCKER

Dockerfile

@@ -1,20 +1,20 @@
 # Step 1: Compilation of Angular frontend
 # It will be embedded as a static resource into Spring Boot backend
-FROM node:18 AS angular
-COPY vscode4teaching-webapp /usr/src/app
+FROM node:22 AS angular
+COPY frontend /usr/src/app
 WORKDIR /usr/src/app
 RUN ["npm", "install"]
 RUN ["npm", "run", "build"]
 
 # Step 2: Compilation of Maven project (generation of JAR)
-FROM maven:3.9.7-eclipse-temurin-11 AS builder
-COPY vscode4teaching-server /data
-COPY --from=angular /usr/src/app/dist/vscode4teaching /data/src/main/resources/static/
+FROM maven:3.9.9-eclipse-temurin-21 AS builder
+COPY backend /data
+COPY --from=angular /usr/src/app/dist/vscode4teaching/browser /data/src/main/resources/static/
 WORKDIR /data
 RUN ["mvn", "clean", "package"]
 
 # Step 3: Generation of Docker image using the JAR previously built
-FROM eclipse-temurin:11
-COPY --from=builder /data/target/vscode4teaching-server-*.jar ./app/vscode4teaching-server.jar
+FROM eclipse-temurin:21.0.5_11-jre
+COPY --from=builder /data/target/vscode4teaching-*.jar ./app/vscode4teaching-server.jar
 EXPOSE 8080
 ENTRYPOINT [ "java", "-jar", "./app/vscode4teaching-server.jar" ]

backend/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
         <relativePath/>
     </parent>
 

docker-compose.yml

@@ -1,25 +1,29 @@
 name: vscode4teaching
 
 services:
-    app:
-        image: vscode4teaching/vscode4teaching:2.2.1
-        depends_on:
-            - db
-        env_file:
-            - path: .env
-              required: true
-        ports:
-            - ${SERVER_PORT}:${SERVER_PORT}
-        volumes:
-            - ./volume-v4t:${V4T_FILEDIRECTORY}
-        restart: on-failure:6
-    db:
-        image: mysql:8.4.0
-        restart: on-failure:3
-        environment:
-            MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-            MYSQL_DATABASE: ${MYSQL_DATABASE}
-            MYSQL_USER: ${SPRING_DATASOURCE_USERNAME}
-            MYSQL_PASSWORD: ${SPRING_DATASOURCE_PASSWORD}
-        volumes:
-            - ./volume-mysql:/var/lib/mysql
+  app:
+    image: vscode4teaching/vscode4teaching:3.0.0
+    depends_on:
+      - db
+    env_file:
+      - path: .env
+        required: true
+    ports:
+      - ${SERVER_PORT}:${SERVER_PORT}
+    volumes:
+      - vscode4teaching-courses:${V4T_FILEDIRECTORY}
+    restart: on-failure:6
+  db:
+    image: mysql:9.1.0
+    restart: on-failure:3
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      MYSQL_USER: ${SPRING_DATASOURCE_USERNAME}
+      MYSQL_PASSWORD: ${SPRING_DATASOURCE_PASSWORD}
+    volumes:
+      - vscode4teaching-db:/var/lib/mysql
+
+volumes:
+  vscode4teaching-courses:
+  vscode4teaching-db: