File tree 3 files changed +20
-1
lines changed
3 files changed +20
-1
lines changed Original file line number Diff line number Diff line change @@ -30,6 +30,12 @@ if ! docker ps >/dev/null 2>&1 ; then
30
30
exit 1
31
31
fi
32
32
33
+ if [ ! -z " ${DOCKERHUB_PULL_USERNAME:- } " ]; then
34
+ set +x
35
+ echo " ${DOCKERHUB_PULL_PASSWORD:- } " | docker login --username " ${DOCKERHUB_PULL_USERNAME} " --password-stdin
36
+ set -x
37
+ fi
38
+
33
39
rm -rf ~ /.ddev/Test* ~ /.ddev/global_config.yaml ~ /.ddev/homeadditions ~ /.ddev/commands
34
40
35
41
# There are discrepancies in golang hash checking in 1.11+, so kill off modcache to solve.
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
3
3
set -o errexit
4
- set -x
5
4
6
5
# Basic tools
7
6
7
+ set -x
8
+
9
+ if [ ! -z " ${DOCKERHUB_PULL_USERNAME:- } " ]; then
10
+ set +x
11
+ echo " ${DOCKERHUB_PULL_PASSWORD} " | docker login --username " ${DOCKERHUB_PULL_USERNAME} " --password-stdin
12
+ set -x
13
+ fi
14
+
8
15
sudo apt-get update -qq
9
16
sudo apt-get install -qq mysql-client realpath zip jq expect nfs-kernel-server build-essential curl git libnss3-tools libcurl4-gnutls-dev
10
17
Original file line number Diff line number Diff line change @@ -50,3 +50,9 @@ timeout -v 10m bash -c 'while ! docker ps 2>/dev/null ; do
50
50
sleep 5
51
51
echo "Waiting for docker to come up: $(date)"
52
52
done'
53
+
54
+ if [ ! -z " ${DOCKERHUB_PULL_USERNAME:- } " ]; then
55
+ set +x
56
+ echo " ${DOCKERHUB_PULL_PASSWORD:- } " | docker login --username " ${DOCKERHUB_PULL_USERNAME} " --password-stdin
57
+ set -x
58
+ fi
You can’t perform that action at this time.
0 commit comments