Another Github Actions Implementation Try #2

.github/workflows/ci.yaml

@@ -14,16 +14,8 @@ jobs:
           java-version: 17
       - name: Build Docker images
         env:
-<<<<<<< Updated upstream
             POSTGRES_USER: postgres
             POSTGRES_PASSWORD: postgres
             POSTGRES_DB: classcode
             JDBC_DATABASE_URL: jdbc:postgresql://db-docker:5432/classcode?user=postgres&password=postgres
-        run: code/jvm/gradlew -p code/jvm/ check
-=======
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: classcode
-          JDBC_DATABASE_URL: jdbc:postgresql://db-docker:5432/classcode?user=postgres&password=postgres
         run: code/jvm/gradlew -p code/jvm/ actions
->>>>>>> Stashed changes

code/jvm/build.gradle.kts

@@ -86,11 +86,7 @@ task<Exec>("dbDockerDown") {
 }
 
 task<Exec>("composeUp") {
-<<<<<<< Updated upstream
-    commandLine("docker-compose", "up", "--build", "--force-recreate")
-=======
     commandLine("docker", "compose","-f","docker-compose.composeUp.yml", "up", "--build", "--force-recreate")
->>>>>>> Stashed changes
     dependsOn("extractUberJar")
 }
 

code/jvm/docker-compose.composeUp.yml

@@ -1,22 +1,5 @@
 version: "3.9"
 services:
-  # The service running the DB
-  db-docker:
-    container_name: db-docker
-    hostname: db-docker
-    build:
-        context: ../..
-        dockerfile: code/jvm/docker/files/Dockerfile-db
-    environment:
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - POSTGRES_DB=${POSTGRES_DB}
-
-    ports:
-      - "5432:5432"
-
-    networks:
-      - net-classcode
 
   # The service running the API
   spring-service:
@@ -32,12 +15,6 @@ services:
     ports:
       - "8080:8080"
 
-    networks:
-      - net-classcode
-
-    depends_on:
-      - db-docker
-
   # The service running the load-balancer
   nginx:
     container_name: nginx
@@ -49,11 +26,4 @@ services:
       - "3000:3000"
 
     depends_on:
-      - spring-service
-
-    networks:
-      - net-classcode
-
-networks:
-    net-classcode:
-        driver: bridge
+        - spring-service

code/jvm/docker/files/Dockerfile-db

@@ -11,8 +11,4 @@ COPY --chown=postgres:postgres ./code/jvm/docker/scripts/wait-for-postgres.sh ./
 RUN chmod +x ./bin/wait-for-postgres.sh
 
 # Expose PostgreSQL default port
-<<<<<<< Updated upstream
 EXPOSE 5432
-=======
-EXPOSE 5432
->>>>>>> Stashed changes

code/jvm/docker/scripts/wait-for-postgres.sh

@@ -16,7 +16,3 @@ done
 >&2 echo "Postgres is up - executing command '$cmd'"
 eval "$cmd"
 
-<<<<<<< Updated upstream
-
-=======
->>>>>>> Stashed changes