From 635b33026c4486678d329a3e73a489a7fd9849fc Mon Sep 17 00:00:00 2001
From: Tianhao-Gu <tgu@anl.gov>
Date: Wed, 20 Nov 2024 16:09:04 -0600
Subject: [PATCH 1/2] remove contianer_name for all containers

---
 docker-compose.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index d7008f9..2528aa7 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -95,7 +95,6 @@ services:
 
   minio:
     image: minio/minio
-    container_name: spark-minio
     ports:
       - "9002:9002"
       # MinIO Console is available at http://localhost:9003
@@ -132,7 +131,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    container_name: cdm-jupyterhub
     platform: linux/amd64
     ports:
       - "4043:4043"
@@ -172,7 +170,6 @@ services:
   postgres:
     image: postgres:16.3
     restart: always
-    container_name: postgres
     # To avoid incorrect user permissions, manually create the volume directory before running Docker.
     # export UID=$(id -u)
     # export GID=$(id -g)

From 6fefc25cb7474ca83d2e8dbf101abe0670c459af Mon Sep 17 00:00:00 2001
From: Tianhao-Gu <tgu@anl.gov>
Date: Wed, 20 Nov 2024 17:12:34 -0600
Subject: [PATCH 2/2] revert chagnes

---
 docker-compose.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 2528aa7..882f9ec 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -6,6 +6,7 @@ services:
 
   yarn-resourcemanager:
     image: ghcr.io/kbase/cdm-prototype-yarn:pr-8
+    container_name: yarn-resourcemanager
     # Images from the ghcr.io/kbase registry are exclusively available for Linux/AMD64 platforms.
     platform: linux/amd64
     ports:
@@ -20,6 +21,7 @@ services:
 
   yarn-nodemanager:
     image: ghcr.io/kbase/cdm-prototype-yarn:pr-8
+    container_name: yarn-nodemanager
     platform: linux/amd64
     ports:
       - 8042:8042  # web ui
@@ -35,6 +37,7 @@ services:
   spark-master:
     # The latest image from cdm-jupyterhub that includes spark standalone mode
     image: ghcr.io/kbase/cdm-jupyterhub:pr-74
+    container_name: spark-master
     platform: linux/amd64
     ports:
       - "8090:8090"
@@ -54,6 +57,7 @@ services:
   spark-worker-1:
     # The latest image from cdm-jupyterhub that includes spark standalone mode
     image: ghcr.io/kbase/cdm-jupyterhub:pr-74
+    container_name: spark-worker-1
     platform: linux/amd64
     ports:
       - "8081:8081"
@@ -75,6 +79,7 @@ services:
   spark-worker-2:
     # The latest image from cdm-jupyterhub that includes spark standalone mode
     image: ghcr.io/kbase/cdm-jupyterhub:pr-74
+    container_name: spark-worker-2
     platform: linux/amd64
     ports:
       - "8082:8082"
@@ -95,6 +100,7 @@ services:
 
   minio:
     image: minio/minio
+    container_name: spark-minio
     ports:
       - "9002:9002"
       # MinIO Console is available at http://localhost:9003
@@ -131,6 +137,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
+    container_name: cdm-jupyterhub
     platform: linux/amd64
     ports:
       - "4043:4043"
@@ -170,6 +177,7 @@ services:
   postgres:
     image: postgres:16.3
     restart: always
+    container_name: postgres
     # To avoid incorrect user permissions, manually create the volume directory before running Docker.
     # export UID=$(id -u)
     # export GID=$(id -g)