Revert changes and downgrade openjdk11 to jre-11.0.9.1_1-alpine

yuzutech · Feb 26, 2021 · 5f55efb · 5f55efb
1 parent 6f936f2
commit 5f55efb
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 51 deletions.
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -68,14 +68,5 @@ jobs:
     - name: Install Node dependencies
       run: npm install
 
-    - run: free -m
-
     - name: Run smoke tests
       run: make smokeTests
-
-    - run: free -m
-      if: ${{ always() }}
-
-    - name: Troubleshoot
-      run: make smokeTestsLogs
-      if: ${{ always() }}
diff --git a/Makefile b/Makefile
@@ -80,9 +80,6 @@ smokeTests:
 	&& npm test \
 	&& docker-compose -f "$(SMOKE_TESTS_DIR)/docker-compose.yaml" stop
 
-smokeTestsLogs:
-	docker-compose --file "$(SMOKE_TESTS_DIR)/docker-compose.yaml" logs kroki
-
 installJavaScriptDependencies:
 	npm i --prefix bpmn
 	npm run prestart --prefix bpmn

diff --git a/server/ops/docker/jdk11-alpine/Dockerfile b/server/ops/docker/jdk11-alpine/Dockerfile
@@ -1,5 +1,10 @@
+# /!\ WARNING /!\
+# Do not upgrade to "adoptopenjdk/openjdk11:jre-11.0.10_9-alpine"
+# This version is based on alpine 3.13.2 and will cause a SegFault!
+# https://github.com/AdoptOpenJDK/openjdk-docker/issues/520
+
 # based on alpine 3.12
-FROM adoptopenjdk/openjdk11:jre-11.0.10_9-alpine
+FROM adoptopenjdk/openjdk11:jre-11.0.9.1_1-alpine
 
 COPY --from=kroki-builder-static-svgbob:latest /home/rust/.cargo/bin/svgbob /rust/bin/svgbob
 COPY --from=kroki-builder-static-erd:latest /root/.local/bin/erd /haskell/bin/erd

diff --git a/server/ops/docker/jdk11-alpine/test b/server/ops/docker/jdk11-alpine/test
diff --git a/tests/smoke/docker-compose.yaml b/tests/smoke/docker-compose.yaml
@@ -2,7 +2,9 @@ version: "3"
 
 services:
   kroki:
-    image: "yuzutech/kroki:latest"
+    build:
+      context: ../../server/
+      dockerfile: ops/docker/jdk11-alpine/Dockerfile
     depends_on:
       - blockdiag
       - mermaid
@@ -17,21 +19,21 @@ services:
       - "8000:8000"
 
   blockdiag:
-    image: "yuzutech/kroki-blockdiag:latest"
+    build: ../../blockdiag
     ports:
       - "8001:8001"
 
   mermaid:
-    image: "yuzutech/kroki-mermaid:latest"
+    build: ../../mermaid
     ports:
       - "8002:8002"
 
   bpmn:
-    image: "yuzutech/kroki-bpmn:latest"
+    build: ../../bpmn
     ports:
       - "8003:8003"
 
   excalidraw:
-    image: "yuzutech/kroki-excalidraw:latest"
+    build: ../../excalidraw
     ports:
       - "8004:8004"