From cb716baba0f2e5ceaf82969f8aed140001272139 Mon Sep 17 00:00:00 2001
From: Justin Merz <jrmerz@gmail.com>
Date: Mon, 19 Aug 2024 08:05:48 -0700
Subject: [PATCH] fix for local build

---
 devops/build-context.sh  | 14 ++++----------
 devops/build.sh          |  6 ------
 services/init/Dockerfile |  2 +-
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/devops/build-context.sh b/devops/build-context.sh
index 835b56d..efa0d50 100755
--- a/devops/build-context.sh
+++ b/devops/build-context.sh
@@ -14,7 +14,7 @@ else
 fi
 BUILD_DATETIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
 
-DOCKER="docker"
+DOCKER="docker --debug"
 if [[ ! -z $BUILD_ARCHITECTURE ]]; then
   DOCKER="$DOCKER --context $BUILD_ARCHITECTURE"
 fi
@@ -24,6 +24,8 @@ export DOCKER_BUILDKIT=1
 DOCKER_BUILD="$DOCKER buildx build --output=type=docker --cache-to=type=inline,mode=max "
 if [[ $LOCAL_DEV != 'true' ]]; then
   DOCKER_BUILD="$DOCKER_BUILD --pull "
+else
+  DOCKER_BUILD="$DOCKER_BUILD --load"
 fi
 
 DOCKER_PUSH="$DOCKER push "
@@ -105,7 +107,6 @@ $DOCKER_BUILD \
   --build-arg FIN_SERVER_REPO_HASH=${FIN_SERVER_REPO_HASH} \
   --build-arg BUILD_DATETIME=${BUILD_DATETIME} \
   $(echo $IMAGE_TAG_FLAGS) \
-  --cache-from $CACHE_IMAGE \
   services/fcrepo
 push $FCREPO_IMAGE_NAME
 
@@ -118,7 +119,6 @@ $DOCKER_BUILD \
   --build-arg FIN_SERVER_REPO_HASH=${FIN_SERVER_REPO_HASH} \
   --build-arg BUILD_DATETIME=${BUILD_DATETIME} \
    $(echo $IMAGE_TAG_FLAGS) \
-  --cache-from $CACHE_IMAGE \
   services/postgres
 push $POSTGRES_IMAGE_NAME
 
@@ -131,7 +131,6 @@ $DOCKER_BUILD \
   --build-arg FIN_SERVER_REPO_HASH=${FIN_SERVER_REPO_HASH} \
   --build-arg BUILD_DATETIME=${BUILD_DATETIME} \
   $(echo $IMAGE_TAG_FLAGS) \
-  --cache-from $CACHE_IMAGE \
   services/load-balancer
 push $LB_IMAGE_NAME
 
@@ -145,7 +144,6 @@ $DOCKER_BUILD \
   --build-arg FIN_SERVER_REPO_HASH=${FIN_SERVER_REPO_HASH} \
   --build-arg BUILD_DATETIME=${BUILD_DATETIME} \
   $(echo $IMAGE_TAG_FLAGS) \
-  --cache-from $CACHE_IMAGE \
   -f services/fin/Dockerfile \
   .
 push $SERVER_IMAGE_NAME
@@ -159,7 +157,6 @@ $DOCKER_BUILD \
   --build-arg FIN_SERVER_REPO_HASH=${FIN_SERVER_REPO_HASH} \
   --build-arg BUILD_DATETIME=${BUILD_DATETIME} \
   $(echo $IMAGE_TAG_FLAGS) \
-  --cache-from $CACHE_IMAGE \
   services/elastic-search
 push $ELASTIC_SEARCH_IMAGE_NAME
 
@@ -172,21 +169,19 @@ $DOCKER_BUILD \
   --build-arg FIN_SERVER_REPO_HASH=${FIN_SERVER_REPO_HASH} \
   --build-arg BUILD_DATETIME=${BUILD_DATETIME} \
   $(echo $IMAGE_TAG_FLAGS) \
-  --cache-from $CACHE_IMAGE \
   services/rabbitmq
 push $RABBITMQ_IMAGE_NAME
 
 # Core - Init services
 get_tags $INIT_IMAGE_NAME
 $DOCKER_BUILD \
-  --build-arg FIN_SERVER_IMAGE=${BUILD_FIN_SERVER_IMAGE} \
   --build-arg FIN_APP_VERSION=${APP_VERSION} \
+  --build-arg FIN_SERVER_IMAGE=${BUILD_FIN_SERVER_IMAGE} \
   --build-arg FIN_REPO_TAG=${FIN_TAG_NAME} \
   --build-arg FIN_BRANCH_NAME=${FIN_BRANCH_NAME} \
   --build-arg FIN_SERVER_REPO_HASH=${FIN_SERVER_REPO_HASH} \
   --build-arg BUILD_DATETIME=${BUILD_DATETIME} \
   $(echo $IMAGE_TAG_FLAGS) \
-  --cache-from $CACHE_IMAGE \
   services/init
 push $INIT_IMAGE_NAME
 
@@ -199,6 +194,5 @@ $DOCKER_BUILD \
   --build-arg FIN_SERVER_REPO_HASH=${FIN_SERVER_REPO_HASH} \
   --build-arg BUILD_DATETIME=${BUILD_DATETIME} \
   $(echo $IMAGE_TAG_FLAGS) \
-  --cache-from $CACHE_IMAGE \
   services/pg-rest
 push $PGREST_IMAGE_NAME
\ No newline at end of file
diff --git a/devops/build.sh b/devops/build.sh
index 06b03e8..c90a110 100755
--- a/devops/build.sh
+++ b/devops/build.sh
@@ -80,7 +80,6 @@ $DOCKER_BUILD \
   --build-arg FIN_SERVER_REPO_HASH=${FIN_SERVER_REPO_HASH} \
   --build-arg BUILD_DATETIME=${BUILD_DATETIME} \
   $(echo $IMAGE_TAG_FLAGS) \
-  --cache-from $FCREPO_IMAGE_NAME:$FIN_BRANCH_NAME \
   services/fcrepo
 
 # Core Server - postgres
@@ -104,7 +103,6 @@ $DOCKER_BUILD \
   --build-arg FIN_SERVER_REPO_HASH=${FIN_SERVER_REPO_HASH} \
   --build-arg BUILD_DATETIME=${BUILD_DATETIME} \
   $(echo $IMAGE_TAG_FLAGS) \
-  --cache-from $LB_IMAGE_NAME:$FIN_BRANCH_NAME \
   services/load-balancer
 
 # Core Server - server
@@ -116,7 +114,6 @@ $DOCKER_BUILD \
   --build-arg FIN_SERVER_REPO_HASH=${FIN_SERVER_REPO_HASH} \
   --build-arg BUILD_DATETIME=${BUILD_DATETIME} \
   $(echo $IMAGE_TAG_FLAGS) \
-  --cache-from $SERVER_IMAGE_NAME:$FIN_BRANCH_NAME \
   -f services/fin/Dockerfile \
   .
 
@@ -129,7 +126,6 @@ $DOCKER_BUILD \
   --build-arg FIN_SERVER_REPO_HASH=${FIN_SERVER_REPO_HASH} \
   --build-arg BUILD_DATETIME=${BUILD_DATETIME} \
   $(echo $IMAGE_TAG_FLAGS) \
-  --cache-from $ELASTIC_SEARCH_IMAGE_NAME:$FIN_BRANCH_NAME \
   services/elastic-search
 
 # Core Server - rabbitmq
@@ -141,7 +137,6 @@ $DOCKER_BUILD \
   --build-arg FIN_SERVER_REPO_HASH=${FIN_SERVER_REPO_HASH} \
   --build-arg BUILD_DATETIME=${BUILD_DATETIME} \
   $(echo $IMAGE_TAG_FLAGS) \
-  --cache-from $RABBITMQ_IMAGE_NAME:$FIN_BRANCH_NAME \
   services/rabbitmq
 
 # Core - Init services
@@ -165,5 +160,4 @@ $DOCKER_BUILD \
   --build-arg FIN_SERVER_REPO_HASH=${FIN_SERVER_REPO_HASH} \
   --build-arg BUILD_DATETIME=${BUILD_DATETIME} \
   $(echo $IMAGE_TAG_FLAGS) \
-  --cache-from $PGREST_IMAGE_NAME:$BUILD_DATETIME \
   services/pg-rest
\ No newline at end of file
diff --git a/services/init/Dockerfile b/services/init/Dockerfile
index 82071a2..a53c234 100644
--- a/services/init/Dockerfile
+++ b/services/init/Dockerfile
@@ -1,6 +1,6 @@
 ARG INIT_BASE=gcr.io/ucdlib-pubreg/init-services:main
 ARG FIN_SERVER_IMAGE
-FROM ${FIN_SERVER_IMAGE} as fin-server
+FROM ${FIN_SERVER_IMAGE} AS fin-server
 FROM ${INIT_BASE}
 
 COPY --from=fin-server /fin/api /fin-api