Merge pull request #288 from NorskHelsenett/feature/fix-docker-compos…

…e-for-apple-silicon feature/fix docker compose for apple silicon
NorskHelsenett · Jan 13, 2025 · 2f9963f · 2f9963f
2 parents 61fca2a + 04cccc1
commit 2f9963f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 48 deletions.
diff --git a/.env b/.env
@@ -1,9 +1,9 @@
 COMPOSE_PROJECT_NAME=ror-dev
 ENVIRONMENT=development
 COMPOSE_PATH_SEPARATOR=:
-COMPOSE_FILE=hacks/docker-compose/infrastructure.yaml:hacks/docker-compose/microservices.yaml:hacks/docker-compose/microservices-image-override.yaml:hacks/docker-compose/api.yaml:hacks/docker-compose/api-image-override.yaml:hacks/docker-compose/web.yaml:hacks/docker-compose/web-image-override.yaml
+COMPOSE_FILE=hacks/docker-compose/infrastructure.yaml:hacks/docker-compose/microservices.yaml:hacks/docker-compose/api.yaml:hacks/docker-compose/api-image-override.yaml:hacks/docker-compose/web.yaml:hacks/docker-compose/web-image-override.yaml
 ROR_BUILD_TAG="latest"
-ROR_REPO="ghcr.io/norskhelsenett/ror/"
+ROR_REPO="ghcr.io/norskhelsenett/"
 CONTAINER_REGISTRY=""
 DOCKER_MIRROR=""
 GCR_MIRROR=""
diff --git a/hacks/docker-compose/api.yaml b/hacks/docker-compose/api.yaml
@@ -1,6 +1,7 @@
 services:
   api:
     restart: always
+    platform: linux/amd64
     ports:
       - '10000:8080'
     depends_on:
@@ -22,9 +23,9 @@ services:
       - LOG_LEVEL=debug
       - GIN_MODE=debug
       - ALLOW_ORIGINS=https://ror.sky.test.nhn.no;http://localhost:11000;http://127.0.0.1:11000
-      - OIDC_PROVIDER=http://dex:5556/dex
-      - SKIP_OIDC_ISSUER_VERIFY=true
+      - HTTP_PORT=10000
       - VAULT_URL=http://vault:8200
+      - MONGODB_PORT=27017
       - OPENTELEMETRY_COLLECTOR_ENDPOINT=opentelemetry-collector:4317
       - DEVELOPMENT=false
       - LOCALHOST=false
@@ -33,7 +34,7 @@ services:
       - RABBITMQ_HOST=rabbitmq
       - REDIS_HOST=redis
       - MONGODB_HOST=mongodb
-      - NO_PROXY=*.nhn.no, vault
+      - HEALTHCHECK_ENDPOINT=localhost:9999
     volumes:
       - ../data/secrets:/tmp/secrets:rw
     healthcheck:

diff --git a/hacks/docker-compose/microservices-image-override.yaml b/hacks/docker-compose/microservices-image-override.yaml
diff --git a/hacks/docker-compose/microservices.yaml b/hacks/docker-compose/microservices.yaml
@@ -1,8 +1,7 @@
 services:
   ms-nhn:
-    build:
-      context: ../../
-      dockerfile: cmd/nhn/Dockerfile.compose
+    platform: linux/amd64
+    image: ${ROR_REPO}ror-ms-nhn:${ROR_BUILD_TAG}
     restart: always
     depends_on:
       mongodb:
@@ -38,9 +37,8 @@ services:
       retries: 5
 
   ms-auth:
-    build:
-      context: ../../
-      dockerfile: cmd/auth/Dockerfile.compose
+    platform: linux/amd64
+    image: ${ROR_REPO}ror-ms-auth:${ROR_BUILD_TAG}
     restart: always
     depends_on:
       dex:
@@ -77,9 +75,8 @@ services:
       retries: 5
 
   ms-slack:
-    build:
-      context: ../../
-      dockerfile: cmd/slack/Dockerfile.compose
+    platform: linux/amd64
+    image: ${ROR_REPO}ror-ms-slack:${ROR_BUILD_TAG}
     restart: always
     depends_on:
       rabbitmq:
@@ -108,9 +105,8 @@ services:
       retries: 5
 
   ms-switchboard:
-    build:
-      context: ../../
-      dockerfile: cmd/switchboard/Dockerfile.compose
+    platform: linux/amd64
+    image: ${ROR_REPO}ror-ms-switchboard:${ROR_BUILD_TAG}
     restart: always
     depends_on:
       rabbitmq:
@@ -139,9 +135,8 @@ services:
       retries: 5
 
   ms-audit:
-    build:
-      context: ../../
-      dockerfile: cmd/audit/Dockerfile.compose
+    platform: linux/amd64
+    image: ${ROR_REPO}ror-ms-audit:${ROR_BUILD_TAG}
     restart: always
     depends_on:
       dex:
@@ -182,9 +177,8 @@ services:
       timeout: 10s
       retries: 5
   ms-kind:
-    build:
-      context: ../../
-      dockerfile: cmd/kind/Dockerfile.compose
+    platform: linux/amd64
+    image: ${ROR_REPO}ror-ms-kind:${ROR_BUILD_TAG}
     restart: always
     depends_on:
       rabbitmq:
@@ -226,9 +220,8 @@ services:
       retries: 5
 
   ms-talos:
-    build:
-      context: ../../
-      dockerfile: cmd/talos/Dockerfile.compose
+    platform: linux/amd64
+    image: ${ROR_REPO}ror-ms-talos:${ROR_BUILD_TAG}
     restart: always
     depends_on:
       rabbitmq:

diff --git a/r.sh b/r.sh
@@ -38,4 +38,4 @@ if ! test -f "$envfile"; then
   exit 1
 fi
 
-docker compose --env-file $envfile up openldap dex init-dex-db vault mongodb rabbitmq mongo-express redis ms-auth ms-kind ms-talos $services
+docker compose --env-file $envfile up openldap dex init-dex-db vault mongodb rabbitmq mongo-express redis ms-auth ms-kind $services
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,4 +38,4 @@ if ! test -f "$envfile"; then @@
       exit 1
     fi
-    docker compose --env-file $envfile up openldap dex init-dex-db vault mongodb rabbitmq mongo-express redis ms-auth ms-kind ms-talos $services
+    docker compose --env-file $envfile up openldap dex init-dex-db vault mongodb rabbitmq mongo-express redis ms-auth ms-kind $services