Merge branch 'main' into integration-test-auth-sock

Islandora-Devops · Nov 7, 2024 · e79c115 · e79c115
2 parents ce44d45 + 005c6f0
commit e79c115
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docker-compose.linux.yml b/docker-compose.linux.yml
@@ -8,4 +8,4 @@ services:
       SSH_AUTH_SOCK: ${SSH_AUTH_SOCK}
     volumes:
       # Mount SSH agent so we can authenticate against github inside of the IDE container.
-      - ${SSH_AUTH_SOCK}:${SSH_AUTH_SOCK}:Z
+      - ${SSH_AUTH_SOCK:-/dev/null}:${SSH_AUTH_SOCK:-/tmp/null}:Z
diff --git a/generate-secrets.sh b/generate-secrets.sh
@@ -20,7 +20,7 @@ SALT_FILE="${PROGDIR}/secrets/DRUPAL_DEFAULT_SALT"
 readonly SALT_FILE
 if [ ! -f "${SALT_FILE}" ]; then
   echo "Creating: ${SALT_FILE}" >&2
-  (grep -ao '[A-Za-z0-9_-]' </dev/urandom || true) | head -74 | tr -d '\n' >"${SALT_FILE}"
+  docker run --rm -i --entrypoint bash "${BASE_IMAGE}" -c "(grep -ao '[A-Za-z0-9_-]' </dev/urandom || true) | head -74 | tr -d '\n'" >"${SALT_FILE}"
 fi
 
 # Use openssl to generate certificates.
@@ -57,7 +57,7 @@ done < \
 for secret in "${SECRETS[@]}"; do
   if [ ! -f "${secret}" ]; then
     echo "Creating: ${secret}" >&2
-    (grep -ao "${CHARACTERS}" </dev/urandom || true) | head "-${LENGTH}" | tr -d '\n' >"${secret}"
+    docker run --rm -i --entrypoint bash "${BASE_IMAGE}" -c "(grep -ao '${CHARACTERS}' </dev/urandom || true) | head '-${LENGTH}' | tr -d '\n'" >"${secret}"
   fi
 done