Skip to content

Commit

Permalink
Fixes quickstart-build-and-test CI job in Github (#2055) (#2056)
Browse files Browse the repository at this point in the history
- Removes invalid .dockerignore symlink, which was
  inadvertently commited as part of #1796 (48e3e70)
- For whatever reason, docker build in ubuntu-latest
  no longer accepts a symlinked .dockerignore in the
  root context, so using a full copy instead
  • Loading branch information
keith-ratcliffe committed Aug 4, 2023
1 parent d04a97b commit db491b5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
6 changes: 3 additions & 3 deletions contrib/datawave-quickstart/docker/.dockerignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This .dockerignore gets symlinked temporarily from the datawave repo's
# This .dockerignore gets copied temporarily to the datawave repo's
# root directory by docker-build.sh, since that directory is used as
# the build context for the image.

Expand All @@ -15,9 +15,9 @@
**/.project
**/.settings

# Ignore temporary .dockerignore symlink in the root directory...
# Ignore temporary .dockerignore copy in the root directory...
.dockerignore
# ...but don't ignore the actual .dockerignore file
# ...but don't ignore the actual .dockerignore source file
!**/datawave-quickstart/docker/.dockerignore

# Below, we mostly just ignore enviromnent-specific stuff that may have
Expand Down
2 changes: 0 additions & 2 deletions contrib/datawave-quickstart/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,9 @@ RUN /bin/bash -c "/usr/bin/nohup /usr/sbin/sshd -D &" && \
# Primary data volume (for HDFS, Accumulo, ZooKeeper, etc)
VOLUME ["/opt/datawave/contrib/datawave-quickstart/data"]


# In case user wants to rebuild DW
VOLUME ["$HOME/.m2/repository"]


VOLUME ["/opt/datawave/contrib/datawave-quickstart/hadoop/logs"]
VOLUME ["/opt/datawave/contrib/datawave-quickstart/accumulo/logs"]
VOLUME ["/opt/datawave/contrib/datawave-quickstart/wildfly/standalone/log"]
Expand Down
6 changes: 3 additions & 3 deletions contrib/datawave-quickstart/docker/docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -138,9 +138,9 @@ function prepareBuildContext() {

datawaveBuildSucceeded || fatal "Most recent DataWave build failed. Cannot proceed with Docker build!"

# Set temporary .dockerignore symlink in DATAWAVE_SOURCE_DIR for context exclusions...
# Temporarily copy .dockerignore to DATAWAVE_SOURCE_DIR (i.e., root context for docker build)...

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}"
}
Expand Down

0 comments on commit db491b5

Please sign in to comment.