Merge pull request #18 from EINDEX/en

Support Arm/M1 Chip

Author: haohaolee

docker-compose.build.yml

@@ -9,7 +9,8 @@ services:
     restart: on-failure
     ports:
       - "3000:80"
-  
+    depends_on:
+      - backend
   backend:
     image: haohaolee/insecurity-backend:latest_en
     build:
@@ -19,10 +20,11 @@ services:
       SPRING_PROFILES_ACTIVE: docker
     restart: on-failure
     ports:
-      - "8080:8080"
-
+      - "8081:8080"
+    depends_on:
+      - db
   db:
-    image: mysql:5.7
+    image: mariadb:10.2
     environment:
       MYSQL_DATABASE: insecurity
       MYSQL_ROOT_PASSWORD: root

docker-compose.dev.yml

@@ -30,7 +30,7 @@ services:
     restart: on-failure
 
   db:
-    image: mysql:5.7
+    image: mariadb:10.2
     environment:
       MYSQL_DATABASE: insecurity
       MYSQL_ROOT_PASSWORD: root

docker-compose.yml

@@ -6,17 +6,20 @@ services:
     restart: on-failure
     ports:
       - "3001:80"
-  
+    depends_on:
+      - backend
   backend:
     image: haohaolee/insecurity-backend:latest_en
     environment:
       SPRING_PROFILES_ACTIVE: docker
     restart: on-failure
     ports:
       - "8081:8080"
+    depends_on:
+       - db
 
   db:
-    image: mysql:5.7
+    image: mariadb:10.2
     environment:
       MYSQL_DATABASE: insecurity
       MYSQL_ROOT_PASSWORD: root

docker/Dockerfile.backend

@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11:alpine AS build
+FROM openjdk:11-slim AS build
 
 ENV APP_HOME=/app/
 WORKDIR $APP_HOME
@@ -13,7 +13,7 @@ COPY ./insecurity/backend ./
 RUN ./gradlew build -x test
 
 
-FROM adoptopenjdk/openjdk11:alpine
+FROM openjdk:11-slim
 ENV APP_HOME=/app/
 WORKDIR $APP_HOME
 

docker/Dockerfile.dev.backend

@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11:alpine
+FROM openjdk:11-slim
 
 ENV APP_HOME=/app/
 WORKDIR $APP_HOME