Skip to content

Commit e20dc42

Browse files
committed
test: add missing CI image to mirror
Signed-off-by: Alexandre Rulleau <[email protected]>
1 parent 9468244 commit e20dc42

File tree

10 files changed

+38
-38
lines changed

10 files changed

+38
-38
lines changed

dockerfiles/frameworks/flow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ services:
1414
cap_add:
1515
- SYS_PTRACE
1616
mysql:
17-
image: mysql:5.7
17+
image: registry.ddbuild.io/images/mirror/mysql:5.7
1818
environment:
1919
MYSQL_ROOT_PASSWORD: ""
2020
MYSQL_ALLOW_EMPTY_PASSWORD: 1

dockerfiles/frameworks/laravel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ services:
1616
- SYS_PTRACE
1717

1818
redis:
19-
image: redis:5.0.5
19+
image: registry.ddbuild.io/images/mirror/redis:5.0.5
2020
expose:
2121
- 6379
2222
memcached:
23-
image: memcached
23+
image: registry.ddbuild.io/images/mirror/library/memcached:latest
2424
expose:
2525
- 11211
2626

dockerfiles/frameworks/mongodb-driver.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
- SYS_PTRACE
2121

2222
mongodb:
23-
image: "circleci/mongo:4"
23+
image: "registry.ddbuild.io/images/mirror/circleci/mongo:4"
2424
ports:
2525
- "27017:27017"
2626

dockerfiles/frameworks/symfony.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ services:
1717
- SYS_PTRACE
1818

1919
redis:
20-
image: redis:5.0.5
20+
image: registry.ddbuild.io/images/mirror/redis:5.0.5
2121
expose:
2222
- 6379
2323
redis_cluster:
@@ -31,7 +31,7 @@ services:
3131
- 7004
3232
- 7005
3333
memcached:
34-
image: memcached
34+
image: registry.ddbuild.io/images/mirror/library/memcached:latest
3535
expose:
3636
- 11211
3737

dockerfiles/frameworks/wordpress.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
cap_add:
1313
- SYS_PTRACE
1414
mysql:
15-
image: mysql:5.7
15+
image: registry.ddbuild.io/images/mirror/mysql:5.7
1616
environment:
1717
MYSQL_ROOT_PASSWORD: ""
1818
MYSQL_ALLOW_EMPTY_PASSWORD: 1

dockerfiles/verify_packages/Makefile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ verify_tar_root:
6363
global_test_dependencies: ../../build/packages/datadog-setup.php
6464

6565
test_legacy_installer_no_ext_json: global_test_dependencies
66-
docker run --rm -i -v $(shell pwd)/../../:/app --workdir=/app alpine:3.12 sh dockerfiles/verify_packages/verify_no_ext_json.sh
66+
docker run --rm -i -v $(shell pwd)/../../:/app --workdir=/app registry.ddbuild.io/images/mirror/alpine:3.12 sh dockerfiles/verify_packages/verify_no_ext_json.sh
6767

6868
test_installer: $(shell find installer -name 'test_*.sh' -exec basename {} \;)
6969

@@ -93,30 +93,30 @@ test_upgrade_from_legacy.sh \
9393
test_upgrade_from_php_installer.sh \
9494
: global_test_dependencies
9595
@echo "################### $(@) ###################"
96-
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app php:7.4-cli sh dockerfiles/verify_packages/installer/$(@)
96+
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app registry.ddbuild.io/images/mirror/php:7.4-cli sh dockerfiles/verify_packages/installer/$(@)
9797

9898
test_first_install_php_debug.sh \
9999
test_first_install_php_debugzts.sh \
100100
test_profiler_install_unsupported_debug.sh \
101101
: global_test_dependencies
102102
@echo "################### $(@) ###################"
103-
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app datadog/dd-trace-ci:php-7.4_buster sh dockerfiles/verify_packages/installer/$(@)
103+
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-7.4_buster sh dockerfiles/verify_packages/installer/$(@)
104104

105105
test_first_install_php_zts.sh \
106106
: global_test_dependencies
107107
@echo "################### $(@) ###################"
108-
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app php:7.4-zts-buster sh dockerfiles/verify_packages/installer/$(@)
108+
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app registry.ddbuild.io/images/mirror/php:7.4-zts-buster sh dockerfiles/verify_packages/installer/$(@)
109109

110110
test_install_non_binary.sh \
111111
test_fpm.sh \
112112
: global_test_dependencies
113113
@echo "################### $(@) ###################"
114-
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app php:7.4-fpm sh dockerfiles/verify_packages/installer/$(@)
114+
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app registry.ddbuild.io/images/mirror/php:7.4-fpm sh dockerfiles/verify_packages/installer/$(@)
115115

116116
test_profiler_install_unsupported.sh \
117117
: global_test_dependencies
118118
@echo "################### $(@) ###################"
119-
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app php:7.0-cli sh dockerfiles/verify_packages/installer/$(@)
119+
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app registry.ddbuild.io/images/mirror/php:7.0-cli sh dockerfiles/verify_packages/installer/$(@)
120120

121121
test_alpine_no_ext_json.sh \
122122
test_alpine_no_libcurl.sh \
@@ -126,17 +126,17 @@ test_alpine_install_no_ext_curl_no_curl_cli.sh \
126126
test_alpine_install_no_ext_curl_yes_curl_cli.sh \
127127
: global_test_dependencies
128128
@echo "################### $(@) ###################"
129-
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app alpine:3.13 sh dockerfiles/verify_packages/installer/$(@)
129+
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app registry.ddbuild.io/images/mirror/alpine:3.13 sh dockerfiles/verify_packages/installer/$(@)
130130

131131
test_alpine_zts_no_zend_signals.sh \
132132
: global_test_dependencies
133133
@echo "################### $(@) ###################"
134-
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app dunglas/frankenphp:php8.3.12-alpine sh dockerfiles/verify_packages/installer/$(@)
134+
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app registry.ddbuild.io/images/mirror/dunglas/frankenphp:php8.3.12-alpine sh dockerfiles/verify_packages/installer/$(@)
135135

136136
test_alpine_no_libexecinfo.sh: global_test_dependencies
137137
@echo "################### $(@) ###################"
138-
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app php:7.4-cli-alpine sh dockerfiles/verify_packages/installer/$(@)
138+
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app registry.ddbuild.io/images/mirror/php:7.4-cli-alpine sh dockerfiles/verify_packages/installer/$(@)
139139

140140
test_install_on_plesk.sh: global_test_dependencies
141141
@echo "################### $(@) ###################"
142-
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app plesk/plesk:18.0 sh dockerfiles/verify_packages/installer/$(@)
142+
docker run --rm -i -v $(shell pwd)/../../:/app --env-file $(shell pwd)/.env -e CIRCLECI --workdir=/app registry.ddbuild.io/images/mirror/plesk/plesk:18.0 sh dockerfiles/verify_packages/installer/$(@)

tests/randomized/docker-compose.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
- linux/amd64
1010
args:
1111
PHP_MAJOR_MINOR: "7.0"
12-
image: 'datadog/dd-trace-ci:php-randomizedtests-centos7-7.0-2'
12+
image: 'registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-randomizedtests-centos7-7.0-2'
1313

1414
centos-7.1:
1515
build:
@@ -18,7 +18,7 @@ services:
1818
x-bake: *bake
1919
args:
2020
PHP_MAJOR_MINOR: "7.1"
21-
image: 'datadog/dd-trace-ci:php-randomizedtests-centos7-7.1-2'
21+
image: 'registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-randomizedtests-centos7-7.1-2'
2222

2323
centos-7.2:
2424
build:
@@ -27,7 +27,7 @@ services:
2727
x-bake: *bake
2828
args:
2929
PHP_MAJOR_MINOR: "7.2"
30-
image: 'datadog/dd-trace-ci:php-randomizedtests-centos7-7.2-2'
30+
image: 'registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-randomizedtests-centos7-7.2-2'
3131

3232
centos-7.3:
3333
build:
@@ -36,7 +36,7 @@ services:
3636
x-bake: *bake
3737
args:
3838
PHP_MAJOR_MINOR: "7.3"
39-
image: 'datadog/dd-trace-ci:php-randomizedtests-centos7-7.3-2'
39+
image: 'registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-randomizedtests-centos7-7.3-2'
4040

4141
centos-7.4:
4242
build:
@@ -45,7 +45,7 @@ services:
4545
x-bake: *bake
4646
args:
4747
PHP_MAJOR_MINOR: "7.4"
48-
image: 'datadog/dd-trace-ci:php-randomizedtests-centos7-7.4-2'
48+
image: 'registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-randomizedtests-centos7-7.4-2'
4949

5050
buster-7.4:
5151
build:
@@ -54,7 +54,7 @@ services:
5454
x-bake: *bake
5555
args:
5656
PHP_MAJOR_MINOR: "7.4"
57-
image: 'datadog/dd-trace-ci:php-randomizedtests-buster-7.4-2'
57+
image: 'registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-randomizedtests-buster-7.4-2'
5858

5959
centos-8.0:
6060
build:
@@ -63,7 +63,7 @@ services:
6363
x-bake: *bake
6464
args:
6565
PHP_MAJOR_MINOR: "8.0"
66-
image: 'datadog/dd-trace-ci:php-randomizedtests-centos7-8.0-2'
66+
image: 'registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-randomizedtests-centos7-8.0-2'
6767

6868
buster-8.0:
6969
build:
@@ -72,7 +72,7 @@ services:
7272
x-bake: *bake
7373
args:
7474
PHP_MAJOR_MINOR: "8.0"
75-
image: 'datadog/dd-trace-ci:php-randomizedtests-buster-8.0-2'
75+
image: 'registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-randomizedtests-buster-8.0-2'
7676

7777
centos-8.1:
7878
build:
@@ -81,7 +81,7 @@ services:
8181
x-bake: *bake
8282
args:
8383
PHP_MAJOR_MINOR: "8.1"
84-
image: 'datadog/dd-trace-ci:php-randomizedtests-centos7-8.1-2'
84+
image: 'registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-randomizedtests-centos7-8.1-2'
8585

8686
buster-8.1:
8787
build:
@@ -90,7 +90,7 @@ services:
9090
x-bake: *bake
9191
args:
9292
PHP_MAJOR_MINOR: "8.1"
93-
image: 'datadog/dd-trace-ci:php-randomizedtests-buster-8.1-2'
93+
image: 'registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-randomizedtests-buster-8.1-2'
9494

9595
centos-8.2:
9696
build:
@@ -99,7 +99,7 @@ services:
9999
x-bake: *bake
100100
args:
101101
PHP_MAJOR_MINOR: "8.2"
102-
image: 'datadog/dd-trace-ci:php-randomizedtests-centos7-8.2-2'
102+
image: 'registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-randomizedtests-centos7-8.2-2'
103103

104104
buster-8.2:
105105
build:
@@ -108,7 +108,7 @@ services:
108108
x-bake: *bake
109109
args:
110110
PHP_MAJOR_MINOR: "8.2"
111-
image: 'datadog/dd-trace-ci:php-randomizedtests-buster-8.2-2'
111+
image: 'registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-randomizedtests-buster-8.2-2'
112112

113113
centos-8.3:
114114
build:
@@ -117,7 +117,7 @@ services:
117117
x-bake: *bake
118118
args:
119119
PHP_MAJOR_MINOR: "8.3"
120-
image: 'datadog/dd-trace-ci:php-randomizedtests-centos7-8.3-2'
120+
image: 'registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-randomizedtests-centos7-8.3-2'
121121

122122
buster-8.3:
123123
build:
@@ -126,4 +126,4 @@ services:
126126
x-bake: *bake
127127
args:
128128
PHP_MAJOR_MINOR: "8.3"
129-
image: 'datadog/dd-trace-ci:php-randomizedtests-buster-8.3-2'
129+
image: 'registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-randomizedtests-buster-8.3-2'

tests/randomized/docker/buster.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG PHP_MAJOR_MINOR
22

3-
FROM datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_buster
3+
FROM registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_buster
44

55
USER root
66

tests/randomized/docker/centos.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG PHP_MAJOR_MINOR
22

3-
FROM datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_centos-7
3+
FROM registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_centos-7
44

55
# Getting the latest nginx
66
RUN echo $'[nginx]\nname=nginx repo\nbaseurl=https://nginx.org/packages/mainline/centos/7/$basearch/\ngpgcheck=0\nenabled=1' >> /etc/yum.repos.d/nginx.repo

tests/randomized/lib/docker-compose.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@ services:
77

88
redis:
99
container_name: redis
10-
image: redis:latest
10+
image: registry.ddbuild.io/images/mirror/redis:latest
1111

1212
httpbin:
1313
container_name: httpbin
14-
image: kong/httpbin:0.2.2
14+
image: registry.ddbuild.io/images/mirror/kong/httpbin:0.2.2
1515

1616
memcached:
1717
container_name: memcached
18-
image: "memcached:1.5-alpine"
18+
image: "registry.ddbuild.io/images/mirror/library/memcached:1.5-alpine"
1919

2020
elasticsearch:
2121
container_name: elasticsearch
22-
image: "elasticsearch:7.17.4"
22+
image: "registry.ddbuild.io/images/mirror/elasticsearch:7.17.4"
2323
environment:
2424
- discovery.type=single-node
2525

2626
mysql:
2727
container_name: mysql
28-
image: mysql/mysql-server:8.0
28+
image: registry.ddbuild.io/images/mirror/mysql/mysql-server:8.0
2929
command: --default-authentication-plugin=mysql_native_password
3030
environment:
3131
- MYSQL_ROOT_PASSWORD=test

0 commit comments

Comments
 (0)