Add multi-arch support (#106)

Author: adriananeci

api/Makefile

@@ -1,11 +1,13 @@
 IMG = ghcr.io/hlesey/phippy-api
 TAG = $$(cat src/__version__.py | cut -d '=' -f2 | sed 's/[", ]//g')
 
-
 # Build
-
 build:
-	docker build -t $(IMG):$(TAG) .
-
+	docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t $(IMG):$(TAG) .
+# Push
 push: 
 	docker push $(IMG):$(TAG)
+
+# Build and Push
+build-and-push:
+	docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t $(IMG):$(TAG) --push .

docker-compose.yml

@@ -2,33 +2,38 @@ version: "3.7"
 
 services: 
   ui:
-    image: ghcr.io/hlesey/phippy-ui:1.0
+    image: phippy-ui:v1.0
     environment:
-      API_HOST: api
-      API_PORT: 5000
+      # API_HOST: api
+      # API_PORT: 5000
+      API_HOST: host.docker.internal
+      API_PORT: 8000
     ports:
       - "8080:5000"
     networks:
       - phippy-net
     depends_on:
       - api
   api:
-    image: ghcr.io/hlesey/phippy-api:1.0
+    image: phippy-api:v1.0
     environment:
-      DB_HOST: redis
+      # DB_HOST: redis
+      DB_HOST: host.docker.internal
       DB_PORT: 6379
     ports:
-      - "5000:5000"
+      - "8081:5000"
     networks:
       - phippy-net
     depends_on:
       - redis
   redis:
-    image: ghcr.io/hlesey/redis:6.2.6
+    image: ghcr.io/hlesey/redis:7.4
     networks:
       - phippy-net
+    ports:
+      - "6379:6379"
   redis-exporter:
-    image: bitnami/redis-exporter:1.36.0
+    image: ghcr.io/hlesey/bitnami/redis-exporter:1.62.0
     environment:
       REDIS_ADDR: redis:6379
     ports:

kubernetes/app/db.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: redis
-        image: ghcr.io/hlesey/redis:7.2.3
+        image: ghcr.io/hlesey/redis:7.4
         resources:
           limits:
             memory: "100Mi"

kubernetes/observability/redis-exporter.yaml

@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
       - name: redis-exporter
-        image: bitnami/redis-exporter:1.56.0
+        image: bitnami/redis-exporter:1.62.0
         resources:
           requests:
             cpu: 100m

ui/Makefile

@@ -1,12 +1,13 @@
-
 IMG = ghcr.io/hlesey/phippy-ui
 TAG = $$(cat src/__version__.py | cut -d '=' -f2 | sed 's/[", ]//g')
 
-
 # Build
-
 build:
-	docker build -t $(IMG):$(TAG) .
-
-push: 
+	docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t $(IMG):$(TAG) .
+# Push
+push:
 	docker push $(IMG):$(TAG)
+
+# Build and Push
+build-and-push:
+	docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t $(IMG):$(TAG) --push .