added a database in a separate docker container and connected it to t…

.dockerignore

@@ -2,4 +2,5 @@ target/
 .git
 .gitignore
 *.iml
-.idea/
+.idea/
+.vagrant

.github/workflows/cicd_app.yml

@@ -4,8 +4,8 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - main
-      - feat/availability
+      - separate-db
+      # - feat/availability
 
 jobs:
   test-java:

.github/workflows/report.yml

@@ -0,0 +1,42 @@
+name: Build Report
+
+permissions:
+  contents: write
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  build-docs:
+    name: Build Documentation PDF
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: true  # allow pushes
+          fetch-depth: 0             # get full history
+
+      - name: Install Pandoc & XeLaTeX
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y pandoc texlive-xetex
+
+      - name: Build report PDF
+        run: |
+          pandoc report/report.md \
+            --from=gfm+yaml_metadata_block+pipe_tables \
+            --resource-path=report:report/diagrams/pdf \
+            -V geometry:margin=0.7in,landscape \
+            --pdf-engine=xelatex \
+            --output report/ITU-MiniTwit-Report.pdf
+
+      - name: Commit & push PDF
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add report/ITU-MiniTwit-Report.pdf
+          # only commit if the PDF actually changed
+          git diff --cached --exit-code || git commit -m "chore: update ITU-MiniTwit-Report.pdf [skip ci]"
+          git push

.gitignore

@@ -5,3 +5,4 @@ Makefile
 flag_tool.c
 minitwit.py
 minitwit.pyc
+.vagrant/

Dockerfile

@@ -8,7 +8,6 @@ RUN mvn clean package
 # Runtime
 FROM eclipse-temurin:21-jdk
 WORKDIR /app
-RUN apt-get update && apt-get install -y sqlite3 && rm -rf /var/lib/apt/lists/*
 
 # JMX exporter
 # copy the JMX exporter and config so the script can pick them up
@@ -18,10 +17,7 @@ EXPOSE 9404
 
 # App
 COPY --from=build /app/target/minitwit-java-app.jar app.jar
-COPY src/main/resources/schema.sql /app/schema.sql
-COPY db_init.sh                   /app/db_init.sh
-RUN chmod +x /app/db_init.sh
 
 # Ports
 EXPOSE 5000
-CMD ["/app/db_init.sh"]
+CMD ["java", "-jar", "app.jar"]

Dockerfile.api

@@ -18,10 +18,7 @@ EXPOSE 9404
 
 # App
 COPY --from=build /app/target/minitwit-java-simulator-api.jar app.jar
-COPY src/main/resources/schema.sql /app/schema.sql
-COPY db_init.sh                   /app/db_init.sh
-RUN chmod +x /app/db_init.sh
 
 # Ports
 EXPOSE 5001
-CMD ["/app/db_init.sh"]
+CMD ["java", "-javaagent:/app/jmx_prometheus_javaagent-0.18.0.jar=9404:/app/jmx_config.yml", "-jar", "app.jar"]

dependency-reduced-pom.xml

@@ -44,6 +44,14 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>8.0.33</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
   <properties>
     <maven.compiler.target>21</maven.compiler.target>
     <maven.compiler.source>21</maven.compiler.source>

docker-compose.yml

@@ -1,25 +1,47 @@
 name: minitwit
 
 services:
-  # BLUE VERSION
+  mysql:
+    image: mysql:latest
+    volumes:
+      - mysql-data:/var/lib/mysql
+      - ./src/main/resources/schema.sql:/docker-entrypoint-initdb.d/schema.sql
+    environment:
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
+      - MYSQL_ALLOW_EMPTY_PASSWORD=${MYSQL_ALLOW_EMPTY_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+    ports:
+      - "${MYSQL_PORT}:3306"
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-uroot", "-p$MYSQL_ROOT_PASSWORD"]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+    restart: always
+
+  # BLUE VERSION (MySQL-based)
   minitwit-blue:
     build:
       context: .
       dockerfile: Dockerfile
     container_name: minitwit-blue
     ports:
-      - "5004:5000"  # exposed for NGINX
+      - "5004:5000"
       - "9404:9404"
       - "9094:9091"
     volumes:
-      - minitwit-data:/data
+    #old sqlite data
+      # - minitwit-data:/data
       - minitwit-logs:/data/logs
     environment:
-      - DATABASE_URL=jdbc:sqlite:/data/minitwit.db
+      - DATABASE_URL=jdbc:mysql://mysql:3306/${MYSQL_DATABASE}?user=root&password=${MYSQL_ROOT_PASSWORD}
       - METRICS_PORT=9091
+    depends_on:
+      mysql:
+        condition: service_healthy
     restart: always
 
-  # GREEN VERSION
+  # GREEN VERSION (MySQL-based)
   minitwit-green:
     build:
       context: .
@@ -30,11 +52,15 @@ services:
       - "9406:9404"
       - "9095:9091"
     volumes:
-      - minitwit-data:/data
+      #old sqlite data
+      # - minitwit-data:/data
       - minitwit-logs:/data/logs
     environment:
-      - DATABASE_URL=jdbc:sqlite:/data/minitwit.db
+      - DATABASE_URL=jdbc:mysql://mysql:3306/${MYSQL_DATABASE}?user=root&password=${MYSQL_ROOT_PASSWORD}
       - METRICS_PORT=9091
+    depends_on:
+      mysql:
+        condition: service_healthy
     restart: always
 
   simulator-api:
@@ -43,14 +69,17 @@ services:
       dockerfile: Dockerfile.api
     ports:
       - "5001:5001"
-      - "9405:9404"     # host 9405 → container 9404
-      - "9092:9091"    # HTTP /metrics (host 9092 → container 9091)
+      - "9405:9404"
+      - "9092:9091"
     volumes:
-      - minitwit-data:/data
+    #old sqlite data
+      # - minitwit-data:/data
       - minitwit-logs:/data/logs
     environment:
-      - DATABASE_URL=jdbc:sqlite:/data/minitwit.db
-      - "9092:9091"    # HTTP /metrics (host 9092 → container 9091)
+      - DATABASE_URL=jdbc:mysql://mysql:3306/${MYSQL_DATABASE}?user=root&password=${MYSQL_ROOT_PASSWORD}
+    depends_on:
+      mysql:
+        condition: service_healthy
     restart: always
 
   node-exporter-app:
@@ -59,7 +88,7 @@ services:
     volumes:
       - /:/host:ro
     ports:
-      - "9101:9100"      # host 9101 → container 9100
+      - "9101:9100"
     restart: unless-stopped
 
   cadvisor-app:
@@ -70,12 +99,11 @@ services:
       - /sys:/sys:ro
       - /var/lib/docker/:/var/lib/docker:ro
     ports:
-      - "8081:8080"      # host 8081 → container 8080
+      - "8081:8080"
     restart: unless-stopped
 
   filebeat:
     image: docker.elastic.co/beats/filebeat:8.8.2
-    # network_mode: "host"               
     user: root
     volumes:
       - type: bind
@@ -87,10 +115,11 @@ services:
       - default
 
 volumes:
+  mysql-data:
+    name: minitwit_mysql-data
   minitwit-data:
     external: true
     name: minitwit_minitwit-data
   minitwit-logs:
     external: true
     name: minitwit_minitwit-logs
-

pom.xml

@@ -67,6 +67,12 @@
             <version>3.47.0.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.33</version>
+        </dependency>
+
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>

report/outline.md

@@ -0,0 +1,45 @@
+## What to include in the report?
+
+### System's Perspective
+
+A description and illustration of the:
+
+  - Design and architecture of your _ITU-MiniTwit_ systems
+  - All dependencies of your _ITU-MiniTwit_ systems on all levels of abstraction and development stages. That is, list and briefly describe all technologies and tools you applied and depend on.
+  - Important interactions of subsystems.
+    - For example, via an illustrative UML Sequence diagram that shows the flow of information through your system from user request in the browser, over all subsystems, hitting the database, and a response that is returned to the user.
+    - Similarly, another illustrative sequence diagram that shows how requests from the simulator traverse your system.
+  - Describe the current state of your systems, for example using results of static analysis and quality assessments.
+
+MSc students should argue for the choice of technologies and decisions for at least all cases for which we asked you to do so in the tasks at the end of each session.
+
+
+### Process' perspective
+
+This perspective should clarify how code or other artifacts come from idea into the running system and everything that happens on the way.
+
+In particular, the following descriptions should be included:
+
+  - A complete description of stages and tools included in the CI/CD chains, including deployment and release of your systems.
+  - How do you monitor your systems and what precisely do you monitor?
+  - What do you log in your systems and how do you aggregate logs?
+  - Brief results of the security assessment and brief description of how did you harden the security of your system based on the analysis.
+  - Applied strategy for scaling and upgrades.
+
+In case you have used AI-assistants during your project briefly explain which system(s) you used during the project and reflect how it supported or hindered your process.
+
+
+
+### Reflection Perspective
+
+Describe the biggest issues, how you solved them, and which are major lessons learned with regards to:
+
+  - evolution and refactoring
+  - operation, and
+  - maintenance
+
+of your _ITU-MiniTwit_ systems. Link back to respective commit messages, issues, tickets, etc. to illustrate these.
+
+
+Also reflect and describe what was the "DevOps" style of your work.
+For example, what did you do differently to previous development projects and how did it work?