Skip to content

Commit 2a7422f

Browse files
authored
Use docker login with team member user, fixes ddev#2544 (ddev#2554)
1 parent eb89007 commit 2a7422f

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

.buildkite/test.sh

+6
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ if ! docker ps >/dev/null 2>&1 ; then
3030
exit 1
3131
fi
3232

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+
3339
rm -rf ~/.ddev/Test* ~/.ddev/global_config.yaml ~/.ddev/homeadditions ~/.ddev/commands
3440

3541
# There are discrepancies in golang hash checking in 1.11+, so kill off modcache to solve.

.circleci/linux_circle_vm_setup.sh

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
#!/usr/bin/env bash
22

33
set -o errexit
4-
set -x
54

65
# Basic tools
76

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+
815
sudo apt-get update -qq
916
sudo apt-get install -qq mysql-client realpath zip jq expect nfs-kernel-server build-essential curl git libnss3-tools libcurl4-gnutls-dev
1017

.circleci/macos_circle_vm_setup.sh

+6
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,9 @@ timeout -v 10m bash -c 'while ! docker ps 2>/dev/null ; do
5050
sleep 5
5151
echo "Waiting for docker to come up: $(date)"
5252
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

0 commit comments

Comments
 (0)