#227 build basic backend deb package

.circleci/config.yml

@@ -0,0 +1,155 @@
+version: 2.1
+orbs:
+  gradle: circleci/[email protected]
+workflows:
+  default:
+    jobs:
+      - be-build
+      - ad-build
+      - be-pack:
+          requires:
+            - be-build
+      - ad-pack:
+          requires:
+            - ad-build
+      - meta-pack
+      - deploy:
+          requires:
+            - be-pack
+            - ad-pack
+            - meta-pack
+          filters:
+            branches:
+              only:
+                - main
+
+jobs:
+  be-build:
+    environment:
+      # Configure the JVM and Gradle to avoid OOM errors
+      _JAVA_OPTIONS: "-Xmx3g"
+      GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2"
+    docker:
+      - image: circleci/openjdk:11.0.3-jdk-stretch
+    working_directory: ~/project/backend
+    steps:
+      - checkout:
+          path: ~/project
+      - restore_cache:
+          key: v2-gradle-wrapper-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
+      - restore_cache:
+          key: v2-gradle-cache-{{ checksum "build.gradle.kts" }}
+      - run: ./gradlew build
+      - save_cache:
+          paths:
+            - .gradle/wrapper
+          key: v2-gradle-wrapper-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
+      - save_cache:
+          paths:
+            - .gradle/caches
+          key: v2-gradle-cache-{{ checksum "build.gradle.kts" }}
+      - store_artifacts:
+          path: build/libs
+      - persist_to_workspace:
+          root: ~/project
+          paths:
+            - backend/build/distributions/*
+
+  ad-build:
+    docker:
+      - image: cimg/node:15.8.0
+    working_directory: ~/project/administration
+    steps:
+      - checkout:
+          path: ~/project
+      - restore_cache:
+          keys:
+            - v1-node-modules-{{ checksum "package.json" }}-{{checksum "package-lock.json" }}
+      - run:
+          name: Install node dependencies
+          command: "[ ! -d node_modules ] && npm ci --loglevel warn --yes || echo package.json and package-lock.json unchanged. Using cache."
+      - run: npm run-script build
+      - save_cache:
+          paths:
+            - node_modules
+          key: v1-node-modules-{{ checksum "package.json" }}-{{checksum "package-lock.json" }}
+      - store_artifacts:
+          path: build
+      - persist_to_workspace:
+          root: ~/project
+          paths:
+            - administration/build
+
+  be-pack:
+    docker:
+      - image: cimg/base:2020.01
+    working_directory: ~/project/backend
+    steps:
+      - checkout:
+          path: ~/project
+      - attach_workspace:
+          at: /tmp/workspace
+      - run: ../scripts/pack_deb.sh -v 0.1 -t /tmp/workspace/backend/build/distributions/*.tar -s ../scripts/eak-backend.service -d "Backend server for the Ehrenamtskarte app" -n "eak-backend" -c "default-jre"
+      - run: |
+          mkdir -p /tmp/artifacts/debs
+          cp *.deb /tmp/artifacts/debs
+      - store_artifacts:
+          path: /tmp/artifacts
+      - persist_to_workspace:
+          root: /tmp/artifacts
+          paths:
+            - debs/*.deb
+
+  ad-pack:
+    docker:
+      - image: cimg/base:2020.01
+    working_directory: ~/project/administration
+    steps:
+      - checkout:
+          path: ~/project
+      - attach_workspace:
+          at: /tmp/workspace
+      - run: ../scripts/pack_deb.sh -v 0.1 -f /tmp/workspace/administration/build -d "Administration backend for the Ehrenamtskarte app" -n "eak-administration"
+      - run: |
+          mkdir -p /tmp/artifacts/debs
+          cp *.deb /tmp/artifacts/debs
+      - store_artifacts:
+          path: /tmp/artifacts
+      - persist_to_workspace:
+          root: /tmp/artifacts
+          paths:
+            - debs/*.deb
+
+  meta-pack:
+    docker:
+      - image: cimg/base:2020.01
+    working_directory: ~/project/administration
+    steps:
+      - checkout:
+          path: ~/project
+      - run: ../scripts/pack_deb.sh -v 0.1 -d "Meta package for the Ehrenamtskarte app" -n "eak" -c "eak-backend, eak-administration"
+      - run: |
+          mkdir -p /tmp/artifacts/debs
+          cp *.deb /tmp/artifacts/debs
+      - store_artifacts:
+          path: /tmp/artifacts
+      - persist_to_workspace:
+          root: /tmp/artifacts
+          paths:
+            - debs/*.deb
+
+  deploy:
+    docker:
+      - image: cimg/base:2020.01
+    steps:
+      - attach_workspace:
+          at: /tmp/workspace
+      - add_ssh_keys:
+          fingerprints:
+            - "5c:8a:70:dc:61:9d:fa:c2:c2:6d:2d:fc:4a:ab:d2:e3"
+      - run:
+          name: "SFTP upload"
+          command: |
+            echo $APT_HOST_FINGERPRINT > known_hosts
+            echo "Uploading: " /tmp/workspace/debs/*.deb
+            sftp -b - -o UserKnownHostsFile=known_hosts [email protected]:/local-apt-repository/ \<<< "put -r /tmp/workspace/debs/*.deb"

administration/administration.iml

@@ -2,7 +2,10 @@
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/node_modules" />
+      <excludeFolder url="file://$MODULE_DIR$/__generated__" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

backend/build.gradle.kts

@@ -49,6 +49,8 @@ dependencies {
     implementation("org.jetbrains.exposed", "exposed-dao", exposed_version)
     implementation("org.jetbrains.exposed", "exposed-jdbc", exposed_version)
     implementation("org.postgresql", "postgresql", "42.2.18")
+    implementation("com.kohlschutter.junixsocket", "junixsocket-core", "2.3.2")
+    implementation("com.kohlschutter.junixsocket", "junixsocket-common", "2.3.2")
 
     implementation("net.postgis", "postgis-jdbc", "2.5.0")
 

backend/gradle.properties

@@ -2,11 +2,9 @@
 
 exposed_version=0.28.1
 
-app.postgres.host=localhost
-app.postgres.port=5432
+app.postgres.url=jdbc:postgresql://localhost:5432/ehrenamtskarte
 app.postgres.user=postgres
 app.postgres.password=postgres
-app.postgres.database=ehrenamtskarte
 
 app.import.xml=https://www.lbe.bayern.de/engagement-anerkennen/ehrenamtskarte/akzeptanzstellen/app-daten.xml
 app.import.json_1=https://bayerische_eak:

backend/src/main/kotlin/app/ehrenamtskarte/backend/common/database/Database.kt

@@ -40,9 +40,9 @@ class Database {
     }
 
     val db by lazy {
-        connect("jdbc:postgresql://" +
-                "${System.getProperty("app.postgres.host")}:${System.getProperty("app.postgres.port")}" +
-                "/${System.getProperty("app.postgres.database")}", driver = "org.postgresql.Driver",
-                user = System.getProperty("app.postgres.user"), password = System.getProperty("app.postgres.password"))
+        connect(
+            System.getProperty("app.postgres.url"), driver = "org.postgresql.Driver",
+            user = System.getProperty("app.postgres.user"), password = System.getProperty("app.postgres.password")
+        )
     }
 }

backend/src/main/kotlin/app/ehrenamtskarte/backend/common/webservice/WebService.kt

@@ -3,18 +3,23 @@ package app.ehrenamtskarte.backend.common.webservice
 import io.javalin.Javalin
 import io.javalin.http.staticfiles.Location
 
-const val PORT = 7000
+const val DEFAULT_PORT = "7000"
 
 class WebService {
     fun start() {
+        val production = System.getProperty("app.production", "").isNotEmpty()
+        val host = System.getProperty("app.host", "0.0.0.0")
+        val port = Integer.parseInt(System.getProperty("app.port", DEFAULT_PORT))
         val app = Javalin.create { cfg ->
-            cfg.enableDevLogging()
-            cfg.enableCorsForAllOrigins()
+            if (!production) {
+                cfg.enableDevLogging()
+                cfg.enableCorsForAllOrigins()
+            }
             cfg.addStaticFiles("/graphiql", "/graphiql", Location.CLASSPATH)
-        }.start(PORT)
+        }.start(host, port)
 
-        println("Server is running at http://localhost:${PORT}")
-        println("Goto http://localhost:${PORT}/graphiql for a graphical editor")
+        println("Server is running at http://${host}:${port}")
+        println("Goto http://${host}:${port}/graphiql for a graphical editor")
 
         val graphQLHandler = GraphQLHandler()
         app.post("/") { ctx -> graphQLHandler.handle(ctx) }

docker-compose.staging.yml

@@ -3,7 +3,7 @@ services:
   backend:
     build: ./backend/
     environment:
-      - BACKEND_OPTS=-Dapp.postgres.host=db-postgis -Dapp.postgres.user=postgres -Dapp.postgres.port=5432 -Dapp.postgres.password=postgres -Dapp.postgres.database=ehrenamtskarte
+      - BACKEND_OPTS=-Dapp.postgres.url=jdbc:postgresql://db-postgis:5432/ehrenamtskarte -Dapp.postgres.user=postgres -Dapp.postgres.password=postgres
     depends_on:
       - db-postgis
     networks:

docker/reverse_proxy/nginx-development.conf

@@ -1,25 +1,39 @@
+# Nginx config for routing within the docker network (development)
+
 upstream martin {
-    server martin:3000;
+    server martin:3000; # Host within docker network
 }
 
 server {
-    listen 80;
+    listen 80 default_server;
     server_name localhost;
 
-    location ~ /tiles/(?<fwd_path>.*) {
+    root /usr/share/nginx/html;
+
+    location = /map.html {
+    }
+
+    location = /style.json {
+    	add_header 'Access-Control-Allow-Origin' '*';
+
+    	sub_filter_once off;
+    	sub_filter_types application/json;
+        sub_filter "https://tiles.staging.ehrenamtskarte.app" "http://localhost:5002";
+
+        try_files $uri /style.json;
+    }
+
+    location ^~ /sprites {
+        add_header 'Access-Control-Allow-Origin' '*';
+
+        try_files $uri $uri;
+    }
+
+    location ~ /(?<fwd_path>.*) {
         proxy_set_header X-Rewrite-URL $request_uri;
         proxy_set_header X-Forwarded-Host $host;
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_pass http://martin/$fwd_path$is_args$args;
     }
-
-    location / {
-	    add_header 'Access-Control-Allow-Origin' '*';
-	    sub_filter_once off;
-	    sub_filter_types application/json;
-        sub_filter "https://vector.ehrenamtskarte.app" "http://localhost:5002";
-        root   /usr/share/nginx/html;
-        index  index.html;
-    }
 }
 

docker/reverse_proxy/nginx-staging.conf

@@ -1,32 +1,45 @@
+# Nginx config for routing within the docker network (staging)
+
 upstream martin {
-    server martin:3000;
+    server martin:3000; # Host within docker network
 }
 
 upstream backend {
-    server backend:7000;
+    server backend:7000; # Host within docker network
 }
 
 server {
-    listen 80;
-    server_name vector.ehrenamtskarte.app;
+    listen 80 default_server;
+    server_name tiles.staging.ehrenamtskarte.app;
+
+    root /usr/share/nginx/html;
+
+    location = /map.html {
+    }
+
+    location = /style.json {
+    	add_header 'Access-Control-Allow-Origin' '*';
+
+        try_files $uri /style.json;
+    }
+
+    location ^~ /sprites {
+        add_header 'Access-Control-Allow-Origin' '*';
+
+        try_files $uri $uri;
+    }
 
-    location ~ /tiles/(?<fwd_path>.*) {
+    location ~ /(?<fwd_path>.*) {
         proxy_set_header X-Rewrite-URL $request_uri;
         proxy_set_header X-Forwarded-Host $host;
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_pass http://martin/$fwd_path$is_args$args;
     }
-
-    location / {
-	    add_header 'Access-Control-Allow-Origin' '*';
-        root   /usr/share/nginx/html;
-        index  index.html;
-    }
 }
 
 server {
     listen 80;
-    server_name api.ehrenamtskarte.app;
+    server_name api.staging.ehrenamtskarte.app;
 
     location / {
         proxy_set_header Host $http_host;