From 090c794c247468d28d1e1d84bc754fb5c9fef3a3 Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Fri, 13 Dec 2024 17:20:07 -0800
Subject: [PATCH] docker: use images instead of build

---
 Makefile     |  8 ++++++++
 compose.yaml | 21 ++++++---------------
 2 files changed, 14 insertions(+), 15 deletions(-)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..5a576f4
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,8 @@
+.PHONY: maps-service web validation
+maps-service:
+	DOCKER_BUILDKIT=1 docker build . -f Containerfile -t maps-service \
+		--secret id=netrc,src=/home/quat/.netrc
+web:
+	docker build web -f web/Containerfile -t maps-service-web
+validation:
+	docker build validation -f validation/Containerfile -t maps-service-validation
diff --git a/compose.yaml b/compose.yaml
index 976ed20..112d4d1 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -3,10 +3,6 @@ networks:
   maps-service-network:
     driver: bridge
 
-secrets:
-  netrc:
-    file: /home/quat/.netrc
-
 services:
   nats:
     image: docker.io/nats:latest
@@ -16,11 +12,8 @@ services:
       - maps-service-network
 
   mapsservice:
-    build:
-      secrets:
-        - netrc
-      context: .
-      dockerfile: Containerfile
+    image:
+      maps-service
     container_name: mapsservice
     command: [
       # debug
@@ -46,18 +39,16 @@ services:
       - "8082:8082"
 
   web:
-    build:
-      context: web
-      dockerfile: Containerfile
+    image:
+      maps-service-web
     networks:
       - maps-service-network
     ports:
       - "3000:3000"
 
   validation:
-    build:
-      context: validation
-      dockerfile: Containerfile
+    image:
+      maps-service-validation
     container_name: validation
     environment:
       - RBXCOOKIE=RBXCOOKIE