From 305ccd5e415b628feeeb1c01693ad85b85246844 Mon Sep 17 00:00:00 2001
From: Aurthur Musendame <musendamea@nmrl.org.zw>
Date: Sat, 14 Sep 2024 15:47:25 +0200
Subject: [PATCH] updated docker files

---
 docker-compose.other.yml | 10 ++--------
 docker-compose.yml       |  5 +----
 notes.txt                | 11 +++++++++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/docker-compose.other.yml b/docker-compose.other.yml
index 80cc0fd6..959bf0a9 100644
--- a/docker-compose.other.yml
+++ b/docker-compose.other.yml
@@ -88,11 +88,8 @@ services:
 
   felicity-static-caddy:
     container_name: felicity-static-caddy
+    image: amusendame/felicity-static-caddy:0.1.1
     restart: unless-stopped
-    build:
-      context: ./
-      target: caddy-static
-      dockerfile: Dockerfile.prod
     ports:
       - "80:80"
       - "443:443"
@@ -115,11 +112,8 @@ services:
 
   felicity-static-nginx:
     container_name: felicity-static-nginx
+    image: amusendame/felicity-static-nginx:0.1.1
     restart: unless-stopped
-    build:
-      context: ./
-      target: nginx-static
-      dockerfile: Dockerfile.prod
     ports:
       - "80:80"
     environment:
diff --git a/docker-compose.yml b/docker-compose.yml
index 72f9915d..c1b9d11b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,11 +16,8 @@ networks:
 services:
   felicity-static-nginx:
     container_name: felicity-static-nginx
+    image: amusendame/felicity-static-nginx:0.1.1
     restart: unless-stopped
-    build:
-      context: ./
-      target: nginx-static
-      dockerfile: Dockerfile.prod
     ports:
       - "80:80"
     environment:
diff --git a/notes.txt b/notes.txt
index 13f4f70d..fd719952 100644
--- a/notes.txt
+++ b/notes.txt
@@ -2,13 +2,20 @@
 // For every push change and bump the version up
 
 // Server All in one
-sudo docker build -f Dockerfile.prod --target server-aio -t amusendame/felicity-lims:aio-0.1.1 .
+export $(grep -v '^#' .env | xargs) && sudo docker build -f Dockerfile.prod --target server-aio -t amusendame/felicity-lims:aio-0.1.1 .
 docker push amusendame/felicity-lims:aio-0.1.1
 
 // Server API
-sudo docker build -f Dockerfile.prod --target server-api -t amusendame/felicity-lims:api-0.1.1 .
+export $(grep -v '^#' .env | xargs) && sudo docker build -f Dockerfile.prod --target server-api -t amusendame/felicity-lims:api-0.1.1 .
 docker push amusendame/felicity-lims:api-0.1.1
 
 // View a summary of image vulnerabilities and recommendations
 docker scout quickview
 
+// Build nginx static
+export $(grep -v '^#' .env | xargs) && sudo docker build -f Dockerfile.prod --target nginx-static -t amusendame/felicity-static-caddy:0.1.1 .
+docker push amusendame/felicity-static-nginx:0.1.1
+
+// Build caddy static
+export $(grep -v '^#' .env | xargs) && sudo docker build -f Dockerfile.prod --target caddy-static -t amusendame/felicity-static-caddy:0.1.1 .
+docker push amusendame/felicity-static-caddy:0.1.1