diff --git a/docker-compose.yml b/docker-compose.yml index 711b740..2acf591 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,3 +48,25 @@ services: - "80:80" volumes: - ./dockerfiles/nginx:/etc/nginx + + battleships-db-test: + container_name: battleships-db-test + build: + context: . + dockerfile: dockerfiles/Dockerfile-db + environment: + - POSTGRES_USER=postgres + - POSTGRES_PASSWORD=postgres + - POSTGRES_DB=daw_g03_test + ports: + - "5432:5432" + + battleships-test: + container_name: battleships-test + depends_on: + - battleships-db-test + build: + context: . + dockerfile: dockerfiles/Dockerfile-test + environment: + - SPRING_DATASOURCE_URL=jdbc:postgresql://battleships-db-test/daw_g03_test diff --git a/dockerfiles/Dockerfile-test b/dockerfiles/Dockerfile-test new file mode 100644 index 0000000..a023432 --- /dev/null +++ b/dockerfiles/Dockerfile-test @@ -0,0 +1,26 @@ +ARG DEPENDENCY=./code/jvm +ARG APP_HOME=/usr/app + +FROM gradle:jdk17 AS CACHE_IMAGE +ARG DEPENDENCY +ARG APP_HOME +ENV GRADLE_USER_HOME=$APP_HOME/.gradle + +RUN mkdir -p $APP_HOME +COPY $DEPENDENCY/build.gradle.kts $APP_HOME +WORKDIR $APP_HOME +RUN gradle --no-daemon + +FROM gradle:jdk17 AS BUILDER_IMAGE +ARG DEPENDENCY +ARG APP_HOME +ENV GRADLE_USER_HOME=$APP_HOME/.gradle +COPY --from=CACHE_IMAGE $APP_HOME/.gradle $APP_HOME/.gradle + +COPY $DEPENDENCY/settings.gradle.kts $APP_HOME +COPY $DEPENDENCY/build.gradle.kts $APP_HOME +COPY $DEPENDENCY/src $APP_HOME/src + +WORKDIR $APP_HOME + +RUN gradle test --no-daemon diff --git a/docs/BattleshipsWeb - Final Presentation.pptx b/docs/BattleshipsWeb - Final Presentation.pptx new file mode 100644 index 0000000..e652bfc Binary files /dev/null and b/docs/BattleshipsWeb - Final Presentation.pptx differ