chore!: first deployment files

.github/workflows/release.yml

@@ -110,13 +110,36 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
         registry: ghcr.io
         workdir: gatewayservice
+  docker-push-api:
+    runs-on: ubuntu-latest
+    needs: [ api-build ]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Publish to Registry
+        uses: elgohr/Publish-Docker-Github-Action@v5
+        env:
+          API_URI: http://${{ secrets.DEPLOY_HOST }}:8080
+          DATABASE_USER: ${{ secrets.DATABASE_USER }}
+          DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
+          JWT_SECRET: ${{ secrets.JWT_SECRET }}
+        with:
+          name: arquisoft/wiq_en2b/api
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: ghcr.io
+          workdir: api
+          buildargs: API_URI
   deploy:
     name: Deploy over SSH
     runs-on: ubuntu-latest
-    needs: [docker-push-userservice,docker-push-authservice,docker-push-gatewayservice,docker-push-webapp]
+    needs: [docker-push-userservice,docker-push-authservice,docker-push-gatewayservice,docker-push-webapp,docker-push-api]
     steps:
     - name: Deploy over SSH
       uses: fifsky/ssh-action@master
+      env:
+        DATABASE_USER: ${{ secrets.DATABASE_USER }}
+        DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
+        JWT_SECRET: ${{ secrets.JWT_SECRET }}
       with:
         host: ${{ secrets.DEPLOY_HOST }}
         user: ${{ secrets.DEPLOY_USER }}

api/Dockerfile

@@ -0,0 +1,39 @@
+FROM amazoncorretto:17
+LABEL authors="dario"
+
+# Install Maven
+RUN yum install -y tar which gzip
+
+ENV MAVEN_HOME /usr/share/maven
+
+COPY --from=maven:3.9.6-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.6-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.6-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+
+RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
+
+ARG MAVEN_VERSION=3.9.6
+ARG USER_HOME_DIR="/root"
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
+
+ARG DATABASE_USER
+ARG DATABASE_PASSWORD
+ARG JWT_SECRET
+
+# Set environment variables
+ENV DATABASE_URL jdbc:postgresql://WIQ_DB:5432/wiq
+ENV DATABASE_USER $DATABASE_USER
+ENV DATABASE_PASSWORD $DATABASE_PASSWORD
+ENV JWT_SECRET $JWT_SECRET
+# Compile api
+COPY . /api
+WORKDIR /api
+RUN mvn install
+COPY target/*.jar app.jar
+ENTRYPOINT ["java","-jar","app.jar"]
+
+
+EXPOSE 8080

api/src/test/java/lab/en2b/quizapi/QuizApiApplicationTests.java

@@ -6,8 +6,4 @@
 @SpringBootTest
 class QuizApiApplicationTests {
 
-	@Test
-	void contextLoads() {
-	}
-
 }

docker-compose.yml

@@ -1,109 +1,37 @@
 version: '3'
 services:
-  mongodb:
-    container_name: mongodb-${teamname:-defaultASW}
-    image: mongo
-    profiles: ["dev", "prod"]
-    volumes:
-      - mongodb_data:/data/db
-    ports:
-      - "27017:27017"
-    networks:
-      - mynetwork
-
-  authservice:
-    container_name: authservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_en2b/authservice:latest
-    profiles: ["dev", "prod"]
-    build: ./users/authservice
-    depends_on:
-      - mongodb
-    ports:
-      - "8002:8002"
-    networks:
-      - mynetwork
+  postgresql:
+    container_name: postgresql-${teamname:-defaultASW}
     environment:
-      MONGODB_URI: mongodb://mongodb:27017/userdb
-
-  userservice:
-    container_name: userservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_en2b/userservice:latest
-    profiles: ["dev", "prod"]
-    build: ./users/userservice
-    depends_on:
-      - mongodb
-    ports:
-      - "8001:8001"
-    networks:
-      - mynetwork
-    environment:
-      MONGODB_URI: mongodb://mongodb:27017/userdb
-
-  gatewayservice:
-    container_name: gatewayservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_en2b/gatewayservice:latest
-    profiles: ["dev", "prod"]
-    build: ./gatewayservice
-    depends_on:
-      - mongodb
-      - userservice
-      - authservice
-    ports:
-      - "8000:8000"
-    networks:
-      - mynetwork
-    environment:
-      AUTH_SERVICE_URL: http://authservice:8002
-      USER_SERVICE_URL: http://userservice:8001
-
-  webapp:
-    container_name: webapp-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_en2b/webapp:latest
+      POSTGRES_USER: ${DATABASE_USER}
+      POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    image: postgres:latest
     profiles: ["dev", "prod"]
-    build: ./webapp
-    depends_on:
-      - gatewayservice
-    ports:
-      - "3000:3000" 
-
-  prometheus:
-    image: prom/prometheus
-    container_name: prometheus-${teamname:-defaultASW}
-    profiles: ["dev"]
     networks:
       - mynetwork
-    volumes:
-      - ./gatewayservice/monitoring/prometheus:/etc/prometheus
-      - prometheus_data:/prometheus
     ports:
-      - "9090:9090"
-    depends_on: 
-      - gatewayservice
-
-  grafana:
-    image: grafana/grafana
-    container_name: grafana-${teamname:-defaultASW}
-    profiles: ["dev"]
+      - "5432:5432"
+
+  api:
+    container_name: api-${teamname:-defaultASW}
+    image: api:latest
+    profiles: [ "dev", "prod" ]
+    build:
+      context: ./api
+      args:
+        DATABASE_USER: ${DATABASE_USER}
+        DATABASE_PASSWORD: ${DATABASE_PASSWORD}
+        JWT_SECRET: ${JWT_SECRET}
     networks:
       - mynetwork
-    volumes:
-      - grafana_data:/var/lib/grafana
-      - ./gatewayservice/monitoring/grafana/provisioning:/etc/grafana/provisioning
-    environment:
-      - GF_SERVER_HTTP_PORT=9091
-      - GF_AUTH_DISABLE_LOGIN_FORM=true
-      - GF_AUTH_ANONYMOUS_ENABLED=true
-      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
     ports:
-      - "9091:9091"
-    depends_on: 
-      - prometheus
+      - "8080:8080"
 
 
 volumes:
-  mongodb_data:
-  prometheus_data: 
-  grafana_data: 
+  postgres_data:
 
 networks:
   mynetwork: