From 43c11e48ea762d0c74161e140c96d28c024f2d23 Mon Sep 17 00:00:00 2001
From: Nathan Miller <nmiller217@gmail.com>
Date: Wed, 8 May 2024 10:50:37 -0700
Subject: [PATCH] remove old commented functionality and provide full
 definition for local Docker image build

---
 compose.yml | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/compose.yml b/compose.yml
index 8fc03db3..a63c083d 100644
--- a/compose.yml
+++ b/compose.yml
@@ -2,17 +2,9 @@ name: odbdesign
 
 services:
 
-  server:
-    ## enable for passing in branch name as an environment variable
-    #environment:
-    #  - BRANCH=nam20485 
-    #image: ghcr.io/nam20485/odbdesign:${BRANCH}-latest
-    image: ghcr.io/nam20485/odbdesign:nam20485-latest
-    ## enable for local build via the Dockerfile (and disable "image:" key above)
-    # build:
-    #   context: .
-    #   dockerfile: Dockerfile
-    #container_name: odbdesign-server   
+  ### use remote image build from github container registry
+  server:    
+    image: ghcr.io/nam20485/odbdesign:nam20485-latest    
     volumes:
       - ./compose-designs:/OdbDesign/designs
     ports:
@@ -20,17 +12,24 @@ services:
     environment:
       - ODBDESIGN_SERVER_REQUEST_USERNAME
       - ODBDESIGN_SERVER_REQUEST_PASSWORD
-    
+
+  ### use local image built from Dockerfile
+  # server:
+  #   build:
+  #     context: .
+  #     dockerfile: Dockerfile
+  #   volumes:
+  #     - ./compose-designs:/OdbDesign/designs
+  #   ports:
+  #     - 8888:8888
+  #   environment:
+  #     - ODBDESIGN_SERVER_REQUEST_USERNAME
+  #     - ODBDESIGN_SERVER_REQUEST_PASSWORD   
    
   swagger-ui:
-    ## enable for passing in branch name as an environment variable
-    # environment:
-    #   - BRANCH=nam20485 
-    # image: ghcr.io/nam20485/odbdesignserver-swaggerui:${BRANCH}-latest
     image: ghcr.io/nam20485/odbdesignserver-swaggerui:nam20485-latest
     #container_name: swagger-ui
     depends_on:
       - server
     ports:
-      - 8080:8080    
-    
\ No newline at end of file
+      - 8080:8080