Skip to content

Commit

Permalink
+ set DOCKER_CONFIG_DIR environment variable
Browse files Browse the repository at this point in the history
  - include a useful default value if the DOCKER_CONFIG_DIR environment
    variable isn't already set.
  • Loading branch information
indraniel authored and Luke-Sikina committed Jul 24, 2024
1 parent c33fb3e commit 42698f4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions start-picsure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
# - Challenge your own understanding of where files are located in docker and on the host file system and
# how that does or doesn't change the commands you run when inside Jenkins

DOCKER_CONFIG_DIR="${DOCKER_CONFIG_DIR:-/usr/local/docker-config}"

if [ -f "$DOCKER_CONFIG_DIR/setProxy.sh" ]; then
. $DOCKER_CONFIG_DIR/setProxy.sh
fi
Expand Down
2 changes: 2 additions & 0 deletions update-jenkins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ git pull
echo "Sometimes we have to update not just the Jenkins jobs, but also the docker image itself."
echo "If you want to update that image. Rerun this command with the --rebuild flag added."

DOCKER_CONFIG_DIR="${DOCKER_CONFIG_DIR:-/usr/local/docker-config}"

if [ "$1" = "--rebuild" ]; then
# Rebuild the docker image. This matches the initial dep script. The proxy args are generally empty, but you might
# run into bugs if you have an http proxy, but don't set it somewhere clever like your bash profile
Expand Down

0 comments on commit 42698f4

Please sign in to comment.