GH-119: Added docker compose file

Author: TiagoMMDavid

.docker/.env

@@ -0,0 +1 @@
+COMPOSE_PROJECT_NAME=codegarten

.docker/docker-compose.yml

@@ -0,0 +1,51 @@
+version: "3.3"
+services:
+  codegarten-server:
+    container_name: codegarten-server
+    build:
+      context: ../code/jvm
+      dockerfile: Dockerfile
+    env_file: ./env_server
+    environment:
+      - JDBC_DATABASE_URL=jdbc:postgresql://codegarten-db:5432/db?user=codegarten&password=changeit
+      - CODEGARTEN_TEST_DB_CONNECTION_STRING=jdbc:postgresql://codegarten-db-tests:5433/db?user=codegarten&password=changeit
+    depends_on:
+      - codegarten-db
+      - codegarten-db-tests
+    ports:
+      - 8080:8080
+  codegarten-web:
+    container_name: codegarten-web
+    build:
+      context: ../code/js
+      dockerfile: Dockerfile
+    env_file: ./env_web
+    environment:
+      - CG_SERVER_API_HOST=http://codegarten-server:8080
+      - CG_SERVER_IM_HOST=http://localhost:8080
+    depends_on:
+      - codegarten-server
+    ports:
+      - 80:80
+  codegarten-db:
+    container_name: codegarten-db
+    build:
+      context: ../code
+      dockerfile: jvm/tests/Dockerfile-codegarten-db
+    environment:
+      - POSTGRES_USER=codegarten
+      - POSTGRES_PASSWORD=changeit
+      - POSTGRES_DB=db
+    ports:
+      - 5432:5432
+  codegarten-db-tests:
+    container_name: codegarten-db-tests
+    build:
+      context: ../code
+      dockerfile: jvm/tests/Dockerfile-codegarten-db-tests
+    environment:
+      - POSTGRES_USER=codegarten
+      - POSTGRES_PASSWORD=changeit
+      - POSTGRES_DB=db
+    ports:
+      - 5433:5432

.gitignore

@@ -1,3 +1,7 @@
+# Docker environment files
+env_web
+env_server
+
 # Logs
 logs
 *.log
@@ -68,10 +72,6 @@ typings/
 # Yarn Integrity file
 .yarn-integrity
 
-# dotenv environment variables file
-.env
-.env.test
-
 # parcel-bundler cache (https://parceljs.org/)
 .cache
 

code/js/Dockerfile

@@ -4,7 +4,6 @@ WORKDIR /app
 
 COPY ./node_modules ./node_modules
 COPY ./public ./public
-COPY secrets ./secrets
 COPY ./dist ./dist
 COPY ./views ./views
 

code/jvm/Dockerfile

@@ -5,7 +5,6 @@ WORKDIR /app
 
 COPY ${DEPENDENCY}/BOOT-INF/lib ./server/lib
 COPY ${DEPENDENCY}/META-INF ./server/META-INF
-COPY secrets ./secrets
 COPY ${DEPENDENCY}/BOOT-INF/classes ./server
 
 EXPOSE 8080

code/jvm/secrets-example/README.md

@@ -25,8 +25,6 @@ import org.springframework.util.Base64Utils
 import org.springframework.web.method.support.HandlerMethodArgumentResolver
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
-import java.lang.IllegalArgumentException
-import java.lang.IllegalStateException
 import java.net.URI
 
 @ConfigurationPropertiesScan

code/jvm/secrets-example/cipher-key.txt

@@ -192,6 +192,7 @@ class ExceptionHandler {
         val cause = ex.cause as SQLException
         val psqlError = ex.getPsqlErrorCode()
 
+        logger.error("[DB Exception] ${cause.localizedMessage}")
         if (psqlError == null) {
             return handleExceptionResponse(
                 URI("/problems/database-error"),

code/jvm/secrets-example/gh-app-private-key.pem

@@ -3,8 +3,6 @@ package org.ionproject.codegarten.utils
 import org.bouncycastle.jce.provider.BouncyCastleProvider
 import org.bouncycastle.util.io.pem.PemReader
 import org.springframework.util.Base64Utils
-import java.io.FileReader
-import java.io.Reader
 import java.security.Key
 import java.security.KeyFactory
 import java.security.MessageDigest

code/jvm/secrets-example/github-app-properties.json

@@ -2,7 +2,9 @@ package org.ionproject.codegarten.auth
 
 import org.ionproject.codegarten.database.dto.User
 import org.ionproject.codegarten.exceptions.AuthorizationException
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertThrows
+import org.junit.jupiter.api.Assertions.fail
 import org.junit.jupiter.api.Test
 
 class AuthHeaderValidatorTest {

code/jvm/src/main/kotlin/org/ionproject/codegarten/CodeGartenApplication.kt

@@ -1,6 +1,9 @@
 package org.ionproject.codegarten.utils
 
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertNotEquals
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest