refactors the deployment procedure

Author: xploitedd

.docker/compose_ci.yaml

@@ -3,7 +3,7 @@ services:
     core:
       build:
         context: ..
-        dockerfile: ./jvm/src/test/resources/dockerfile_ci
+        dockerfile: ./.docker/dockerfiles/dockerfile_ci
       container_name: core-ci-container
       depends_on: [ db ]
       ports:
@@ -12,9 +12,7 @@ services:
         - JDBC_DATABASE_URL=jdbc:postgresql://db:5432/core?user=bob&password=changeit
         - ION_CORE_SECRET_KEY=t8abumA3JBJrd7q0LuN3nSzKGBfslOYb
     db:
-      build:
-        context: ../jvm/src/test/resources
-        dockerfile: ./dockerfile_db
+      image: postgres:13-alpine
       container_name: core-db-container
       ports:
         - 10021:5432

.docker/compose_db.yaml

@@ -1,9 +1,7 @@
 version: '3'
 services:
     db:
-      build:
-        context: ../jvm/src/test/resources
-        dockerfile: ./dockerfile_db
+      image: postgres:13-alpine
       container_name: core-db-container
       ports:
         - 10021:5432

.docker/compose_deploy.yaml

@@ -1,28 +1,9 @@
 version: '3'
-# WARNING!
-# In order for this procedure to work, you need to run docker-compose
-# from the root of the project, such that PWD=<root of the repo folder>
-# e.g. cd <root of project> && docker-compose -f .docker/compose_deploy.yaml run --rm core-deploy
-#
-# Credentials. Create a file named `env_deploy` in this folder, with the contents:
-# GCP_KEY='<JSON key credentials>'
-# GCP_ZONE='<zone of the GCE instance>'
-# GCP_REPO='<GCR repository name>'
-# GCP_INSTANCE='<target GCE instance name>'
-# GCP_PROJECT_ID='<GCP project ID>'
-# GCP_ACCOUNT='<GCP service account's email>'
-# GCP_DB_INSTANCE='<GCP SQL connection instance name>'
-# DB_CON_STRING_SUFFIX='<real db name>?user=<username>&password=<user password>'
-# DEV_DB_CON_STRING_SUFFIX='<auxiliary db name>?user=<username>&password=<user password>'
 services:
     core-deploy:
       build:
         context: ..
-        dockerfile: ./project/res/dockerfile_deploy
-      env_file: ./env_deploy
-      network_mode: host
-      working_dir: "${PWD}"
+        dockerfile: .docker/dockerfiles/dockerfile_deploy
       container_name: core-deploy-container
       volumes:
-        - "${PWD}:${PWD}"
         - "/var/run/docker.sock:/var/run/docker.sock"

.docker/compose_run.yaml

@@ -3,7 +3,7 @@ services:
     core:
       build:
         context: ..
-        dockerfile: ./jvm/src/test/resources/dockerfile_ci
+        dockerfile: ./.docker/dockerfiles/dockerfile_ci
       container_name: core-container
       depends_on: [ db ]
       # The entrypoint script will run the server if Argument 1 = "run"
@@ -15,9 +15,7 @@ services:
         - ION_CORE_SECRET_KEY=t8abumA3JBJrd7q0LuN3nSzKGBfslOYb
         - ION_CORE_BASE_URL=http://localhost:10023
     db:
-      build:
-        context: ../jvm/src/test/resources
-        dockerfile: ./dockerfile_db
+      image: postgres:13-alpine
       container_name: core-db-container
       ports:
         - 10021:5432

.docker/compose_schema_diff.yaml

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+set -eu
+
+core_image_tag="ghcr.io/i-on-project/core:latest"
+
+# Start the database container
+docker-compose -f .docker/compose_db.yaml up -d db
+
+jdbc_database_url="jdbc:postgresql://localhost:10021/core?user=bob&password=changeit"
+ion_core_secret_key="t8abumA3JBJrd7q0LuN3nSzKGBfslOYb"
+
+# Build core image
+docker build -f ./.docker/dockerfiles/dockerfile_assemble \
+  --network host \
+  --build-arg "JDBC_DATABASE_URL=${jdbc_database_url}" \
+  --build-arg "ION_CORE_SECRET_KEY=${ion_core_secret_key}" \
+  -t "${core_image_tag}" .
+
+# Stop the database container
+docker stop core-ci-database 2>/dev/null | true
+docker rm core-ci-database 2>/dev/null | true
+
+# Try to push both images to GitHub Container Registry
+if [ -z "${GITHUB_ACTOR:-}" ] ||\
+    [ -z "${GITHUB_TOKEN:-}" ]; then
+  printf "Set the GITHUB_ACTOR and GITHUB_TOKEN environment variables to push the image to the registry!\n"
+  exit 0
+fi
+
+echo "$GITHUB_TOKEN" | docker login ghcr.io -u "$GITHUB_ACTOR" --password-stdin
+
+docker push "${core_image_tag}"

.docker/compose_schema_force_migration.yaml

@@ -0,0 +1,42 @@
+FROM node:16-alpine3.11 AS node
+
+WORKDIR ./core-react
+COPY ./core-react/package.json package.json
+COPY ./core-react/yarn.lock yarn.lock
+
+RUN yarn install
+
+COPY ./core-react .
+COPY ./jvm ../jvm
+
+RUN yarn build
+
+WORKDIR ..
+
+FROM adoptopenjdk/openjdk11:alpine AS jvm
+
+ARG JDBC_DATABASE_URL
+ARG ION_CORE_SECRET_KEY
+
+COPY --from=node ./jvm ./proj
+COPY ./.docker ./proj/.docker
+
+WORKDIR /proj
+RUN ./gradlew extractUberJar --no-daemon --stacktrace
+
+FROM adoptopenjdk/openjdk11:alpine AS run
+
+RUN addgroup -S spring && adduser -S spring -G spring
+WORKDIR /home/spring
+RUN mkdir -p ./app/resources
+RUN chown spring ./app/resources
+
+USER spring:spring
+
+ARG EXTRACT_DEPENDENCY_PATH=/proj/build/dependency
+
+COPY --from=jvm ${EXTRACT_DEPENDENCY_PATH}/BOOT-INF/lib ./app/lib
+COPY --from=jvm ${EXTRACT_DEPENDENCY_PATH}/META-INF ./app/META-INF
+COPY --from=jvm ${EXTRACT_DEPENDENCY_PATH}/BOOT-INF/classes ./app
+
+ENTRYPOINT ["java", "-cp", "app:app/lib/*", "org.ionproject.core.CoreApplicationKt"]

.docker/compose_schema_migration.yaml

@@ -18,7 +18,8 @@ FROM adoptopenjdk/openjdk11:alpine AS jvm
 RUN apk add postgresql-client
 
 COPY --from=node ./jvm ./proj
+COPY ./.docker ./proj/.docker
 WORKDIR ./proj
-RUN mv ./src/test/resources/bin/poll_db_and_build .
+RUN mv ./.docker/dockerfiles/bin/poll_db_and_build .
 
 ENTRYPOINT [ "./poll_db_and_build" ]

.docker/dockerfiles/bin/deploy

@@ -0,0 +1,6 @@
+FROM alpine:latest
+
+RUN apk add --no-cache docker docker-compose
+
+COPY . .
+ENTRYPOINT [ "./.docker/dockerfiles/bin/deploy" ]

jvm/src/test/resources/bin/poll_db_and_build .docker/dockerfiles/bin/poll_db_and_build

@@ -0,0 +1,20 @@
+name: Continuous Deployment
+
+on:
+  push:
+    branches:
+      - release/*
+
+jobs:
+  build_and_deploy:
+    name: Build And Deploy to GitHub Container Registry
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: Set env file for Docker Compose
+        run: echo -e "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}\nGITHUB_ACTOR=${GITHUB_ACTOR}\nCOMMIT_SHA=${GITHUB_SHA}" > .docker/env_deploy
+
+      - name: Build & Deploy
+        run: docker-compose -f .docker/compose_deploy.yaml run --rm core-deploy

.docker/dockerfiles/dockerfile_assemble

@@ -22,6 +22,8 @@ dependencies {
     runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.11.2")
 
     implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+
     implementation("com.github.ben-manes.caffeine:caffeine:2.8.5")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
@@ -33,6 +35,8 @@ dependencies {
 
     implementation("org.jdbi:jdbi3-kotlin-sqlobject:3.20.0")
 
+    implementation("org.flywaydb:flyway-core:6.5.7")
+
     implementation("com.squareup.okhttp3:okhttp:4.9.1")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-RC")
 
@@ -73,3 +77,11 @@ tasks.register("pgReset") {
     dependsOn(setupTask, stopTask)
     tasks[setupTask].mustRunAfter(stopTask)
 }
+
+tasks.register<Copy>("extractUberJar") {
+    dependsOn("build")
+    dependsOn("test")
+    dependsOn("ktlintCheck")
+    from(zipTree("$buildDir/libs/${rootProject.name}-$version.jar"))
+    into("$buildDir/dependency")
+}

jvm/src/test/resources/dockerfile_ci .docker/dockerfiles/dockerfile_ci

@@ -15,23 +15,20 @@ class CategoryRepoImpl(
     private val categoryMapper: CategoryData.CategoryMapper
 ) : CategoryRepo {
 
-    private val categories = hashMapOf<Int, MutableList<Category>>()
-
-    init {
-        populateCategoryMap()
-    }
-
-    private fun populateCategoryMap() {
+    private val categories: HashMap<Int, MutableList<Category>> by lazy {
+        val map = hashMapOf<Int, MutableList<Category>>()
         transactionManager.run {
             it
                 .createQuery(ALL_CATEGORIES_QUERY)
                 .map(categoryMapper)
                 .list()
         }?.forEach {
-            categories.computeIfAbsent(it.first) {
+            map.computeIfAbsent(it.first) {
                 mutableListOf()
             }.add(it.second)
         }
+
+        map
     }
 
     override fun byId(id: Int): List<Category>? =

.docker/dockerfiles/dockerfile_deploy

@@ -9,27 +9,22 @@ interface LanguageRepo {
 }
 
 @Repository
-class LanguagaRepoImpl(
+class LanguageRepoImpl(
     private val transactionManager: TransactionManager,
     private val languageMapper: LanguageData.LanguageMapper
 ) : LanguageRepo {
 
-    private val languages = hashMapOf<Int, Language>()
-
-    init {
-        populateLanguageMap()
-    }
-
-    private fun populateLanguageMap() {
-        val languages = transactionManager.run {
+    private val languages: HashMap<Int, Language> by lazy {
+        val l = transactionManager.run {
             it.createQuery(LanguageData.ALL_LANGUAGES_QUERY)
                 .map(languageMapper)
                 .list()
         }
 
-        languages?.forEach {
-            this.languages += it
-        }
+        val map = hashMapOf<Int, Language>()
+        l?.forEach { map += it }
+
+        map
     }
 
     override fun byId(id: Int): Language? =