Re: #2055 - WIP

NationalSecurityAgency · Aug 4, 2023 · 486d336 · 486d336
1 parent 56083dd
commit 486d336
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/contrib/datawave-quickstart/docker/Dockerfile b/contrib/datawave-quickstart/docker/Dockerfile
@@ -33,7 +33,7 @@ COPY . /opt/datawave
 
 WORKDIR /opt/datawave
 
-RUN find /opt/datawave -type f && exit 1
+RUN ls -1 /opt/datawave/.git && exit 1
 
 # Create new Git repo and configure environment...
 #RUN git status && cat .dockerignore

diff --git a/contrib/datawave-quickstart/docker/docker-build.sh b/contrib/datawave-quickstart/docker/docker-build.sh
@@ -100,7 +100,7 @@ function removeDatawaveTarball() {
 
 function cleanBuildContext() {
     info "Cleaning up"
-    unlink ${DATAWAVE_SOURCE_DIR}/.dockerignore > /dev/null 2>&1 && info ".dockerignore symlink removed"
+    rm -f ${DATAWAVE_SOURCE_DIR}/.dockerignore > /dev/null 2>&1 && info ".dockerignore copy removed"
 
     # Remove any potentially stale DataWave tarballs from the DW service directory. Removal
     # will guarantee that a fresh Maven build is triggered whenever env.sh is sourced
@@ -134,15 +134,15 @@ function prepareBuildContext() {
 
     # Source env.sh to force all tarballs to be downloaded and the DW binaries to be built, if necessary
 
-    source "${QUICKSTART_DIR}/bin/env.sh"
+    #source "${QUICKSTART_DIR}/bin/env.sh"
 
-    datawaveBuildSucceeded || fatal "Most recent DataWave build failed. Cannot proceed with Docker build!"
+    #datawaveBuildSucceeded || fatal "Most recent DataWave build failed. Cannot proceed with Docker build!"
 
     # Set temporary .dockerignore symlink in DATAWAVE_SOURCE_DIR for context exclusions...
 
-    ln -s "${THIS_DIR}/.dockerignore" "${DATAWAVE_SOURCE_DIR}/.dockerignore" || fatal "Failed to set .dockerignore symlink"
+    cp "${THIS_DIR}/.dockerignore" "${DATAWAVE_SOURCE_DIR}/.dockerignore" || fatal "Failed to copy .dockerignore into place"
 
-    sanityCheckTarball "${QUICKSTART_DIR}/bin/services/maven" "apache-maven*.tar.gz" "${DW_MAVEN_DIST_URI}"
+    #sanityCheckTarball "${QUICKSTART_DIR}/bin/services/maven" "apache-maven*.tar.gz" "${DW_MAVEN_DIST_URI}"
 }
 
 function sanityCheckTarball() {