Skip to content

Commit 25a2829

Browse files
calindcalind
committed
Use v0.8.0 builder image
1 parent 7a75fe5 commit 25a2829

File tree

3 files changed

+42
-53
lines changed

3 files changed

+42
-53
lines changed

‎.drone.yml

Lines changed: 40 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ steps:
1010
- &step
1111
name: setup docker
1212
pull: always
13-
image: docker.io/bitpoke/build:v0.3.0-3.g7069e76
13+
image: docker.io/bitpoke/build:v0.8.0
1414
environment: &baseEnv
1515
TAG_SUFFIX: ${DRONE_BRANCH/master/}
1616
TEST_HOSTNAME: docker
17+
DOCKER_HOST: tcp://docker:2375
1718
commands:
18-
- dockerize -wait unix:///workspace/docker.sock -timeout 10s
19+
- dockerize -wait http://docker:2375/_ping -timeout 30s
1920
- docker info
2021
- make -C php pull-$DRONE_STAGE_NAME
2122

@@ -36,20 +37,18 @@ steps:
3637
pull: default
3738
environment:
3839
<<: *baseEnv
39-
DOCKER_USER:
40-
from_secret: DOCKER_USER
40+
DOCKER_USERNAME: bitpokebot
4141
DOCKER_PASSWORD:
4242
from_secret: DOCKER_PASSWORD
4343
commands:
44-
- docker login -u="$DOCKER_USER" -p="$DOCKER_PASSWORD" docker.io
44+
- /usr/local/bin/setup-credentials-helper.sh
4545
- make -C php push-$DRONE_STAGE_NAME
4646

4747
services:
4848
- name: docker
49-
image: docker:20.10.8-dind
50-
privileged: true
51-
commands:
52-
- /usr/local/bin/dockerd-entrypoint.sh dockerd --host "unix:///workspace/docker.sock" --storage-driver overlay2 --log-level error
49+
image: docker:20.10.8-dind-rootless
50+
environment:
51+
DOCKER_TLS_CERTDIR: ""
5352
---
5453
kind: pipeline
5554
name: php-runtime-7.4
@@ -62,12 +61,13 @@ steps:
6261
- &step
6362
name: setup docker
6463
pull: always
65-
image: docker.io/bitpoke/build:v0.3.0-3.g7069e76
64+
image: docker.io/bitpoke/build:v0.8.0
6665
environment: &baseEnv
6766
TAG_SUFFIX: ${DRONE_BRANCH/master/}
6867
TEST_HOSTNAME: docker
68+
DOCKER_HOST: tcp://docker:2375
6969
commands:
70-
- dockerize -wait unix:///workspace/docker.sock -timeout 10s
70+
- dockerize -wait http://docker:2375/_ping -timeout 30s
7171
- docker info
7272
- make -C php pull-$DRONE_STAGE_NAME
7373

@@ -88,20 +88,18 @@ steps:
8888
pull: default
8989
environment:
9090
<<: *baseEnv
91-
DOCKER_USER:
92-
from_secret: DOCKER_USER
91+
DOCKER_USERNAME: bitpokebot
9392
DOCKER_PASSWORD:
9493
from_secret: DOCKER_PASSWORD
9594
commands:
96-
- docker login -u="$DOCKER_USER" -p="$DOCKER_PASSWORD" docker.io
95+
- /usr/local/bin/setup-credentials-helper.sh
9796
- make -C php push-$DRONE_STAGE_NAME
9897

9998
services:
10099
- name: docker
101-
image: docker:20.10.8-dind
102-
privileged: true
103-
commands:
104-
- /usr/local/bin/dockerd-entrypoint.sh dockerd --host "unix:///workspace/docker.sock" --storage-driver overlay2 --log-level error
100+
image: docker:20.10.8-dind-rootless
101+
environment:
102+
DOCKER_TLS_CERTDIR: ""
105103

106104
---
107105
kind: pipeline
@@ -118,12 +116,13 @@ steps:
118116
- &step
119117
name: setup docker
120118
pull: always
121-
image: docker.io/bitpoke/build:v0.3.0-3.g7069e76
119+
image: docker.io/bitpoke/build:v0.8.0
122120
environment: &baseEnv
123121
TAG_SUFFIX: ${DRONE_BRANCH/master/}
124122
TEST_HOSTNAME: docker
123+
DOCKER_HOST: tcp://docker:2375
125124
commands:
126-
- dockerize -wait unix:///workspace/docker.sock -timeout 10s
125+
- dockerize -wait http://docker:2375/_ping -timeout 30s
127126
- docker info
128127
- make -C wordpress pull-$DRONE_STAGE_NAME
129128

@@ -144,20 +143,18 @@ steps:
144143
pull: default
145144
environment:
146145
<<: *baseEnv
147-
DOCKER_USER:
148-
from_secret: DOCKER_USER
146+
DOCKER_USERNAME: bitpokebot
149147
DOCKER_PASSWORD:
150148
from_secret: DOCKER_PASSWORD
151149
commands:
152-
- docker login -u="$DOCKER_USER" -p="$DOCKER_PASSWORD" docker.io
150+
- /usr/local/bin/setup-credentials-helper.sh
153151
- make -C wordpress push-$DRONE_STAGE_NAME
154152

155153
services:
156154
- name: docker
157-
image: docker:20.10.8-dind
158-
privileged: true
159-
commands:
160-
- /usr/local/bin/dockerd-entrypoint.sh dockerd --host "unix:///workspace/docker.sock" --storage-driver overlay2 --log-level error
155+
image: docker:20.10.8-dind-rootless
156+
environment:
157+
DOCKER_TLS_CERTDIR: ""
161158

162159
---
163160
kind: pipeline
@@ -174,12 +171,13 @@ steps:
174171
- &step
175172
name: setup docker
176173
pull: always
177-
image: docker.io/bitpoke/build:v0.3.0-3.g7069e76
174+
image: docker.io/bitpoke/build:v0.8.0
178175
environment: &baseEnv
179176
TAG_SUFFIX: ${DRONE_BRANCH/master/}
180177
TEST_HOSTNAME: docker
178+
DOCKER_HOST: tcp://docker:2375
181179
commands:
182-
- dockerize -wait unix:///workspace/docker.sock -timeout 10s
180+
- dockerize -wait http://docker:2375/_ping -timeout 30s
183181
- docker info
184182
- make -C wordpress pull-$DRONE_STAGE_NAME
185183

@@ -200,20 +198,18 @@ steps:
200198
pull: default
201199
environment:
202200
<<: *baseEnv
203-
DOCKER_USER:
204-
from_secret: DOCKER_USER
201+
DOCKER_USERNAME: bitpokebot
205202
DOCKER_PASSWORD:
206203
from_secret: DOCKER_PASSWORD
207204
commands:
208-
- docker login -u="$DOCKER_USER" -p="$DOCKER_PASSWORD" docker.io
205+
- /usr/local/bin/setup-credentials-helper.sh
209206
- make -C wordpress push-$DRONE_STAGE_NAME
210207

211208
services:
212209
- name: docker
213-
image: docker:20.10.8-dind
214-
privileged: true
215-
commands:
216-
- /usr/local/bin/dockerd-entrypoint.sh dockerd --host "unix:///workspace/docker.sock" --storage-driver overlay2 --log-level error
210+
image: docker:20.10.8-dind-rootless
211+
environment:
212+
DOCKER_TLS_CERTDIR: ""
217213

218214
---
219215
kind: pipeline
@@ -230,12 +226,13 @@ steps:
230226
- &step
231227
name: setup docker
232228
pull: always
233-
image: docker.io/bitpoke/build:v0.3.0-3.g7069e76
229+
image: docker.io/bitpoke/build:v0.8.0
234230
environment: &baseEnv
235231
TAG_SUFFIX: ${DRONE_BRANCH/master/}
236232
TEST_HOSTNAME: docker
233+
DOCKER_HOST: tcp://docker:2375
237234
commands:
238-
- dockerize -wait unix:///workspace/docker.sock -timeout 10s
235+
- dockerize -wait http://docker:2375/_ping -timeout 30s
239236
- docker info
240237
- make -C wordpress pull-$DRONE_STAGE_NAME
241238

@@ -256,18 +253,16 @@ steps:
256253
pull: default
257254
environment:
258255
<<: *baseEnv
259-
DOCKER_USER:
260-
from_secret: DOCKER_USER
256+
DOCKER_USERNAME: bitpokebot
261257
DOCKER_PASSWORD:
262258
from_secret: DOCKER_PASSWORD
263259
commands:
264-
- docker login -u="$DOCKER_USER" -p="$DOCKER_PASSWORD" docker.io
260+
- /usr/local/bin/setup-credentials-helper.sh
265261
- make -C wordpress push-$DRONE_STAGE_NAME
266262

267263
services:
268264
- name: docker
269-
image: docker:20.10.8-dind
270-
privileged: true
271-
commands:
272-
- /usr/local/bin/dockerd-entrypoint.sh dockerd --host "unix:///workspace/docker.sock" --storage-driver overlay2 --log-level error
265+
image: docker:20.10.8-dind-rootless
266+
environment:
267+
DOCKER_TLS_CERTDIR: ""
273268

‎hack/container-structure-test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ PROJECT_ROOT=$(dirname "${BASH_SOURCE}")/..
2424
cd ${PROJECT_ROOT}
2525

2626
exec docker run --rm -w /workspace \
27+
-e DOCKER_HOST \
2728
-v $(pwd):/workspace \
28-
-v /workspace/docker.sock:/var/run/docker.sock \
2929
gcr.io/gcp-runtimes/container-structure-test:v1.8.0 \
3030
"$@"

‎wordpress/test/e2e.bats

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@ TEST_TMP_DIR=""
66
: "${TEST_HOSTNAME:=localhost}"
77

88
docker-compose() {
9-
local _orig="$(which docker-compose)"
10-
if [ -f "${_orig}" ] ; then
11-
cd "$TEST_TMP_DIR" && ${_orig} "$@"
12-
else
13-
echo "Could not find docker-compose." >&2
14-
return 1
15-
fi
9+
cd "$TEST_TMP_DIR" && docker compose "$@"
1610
}
1711

1812
wp() {

0 commit comments

Comments
 (0)