Skip to content

Commit 38e313f

Browse files
committed
TEST/MINOR: docker: upgrade docker for dind and add seccomp option
1 parent b816c50 commit 38e313f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ build:
9595
name: $CI_REGISTRY_GO/docker:stable
9696
entrypoint: [ "" ]
9797
services:
98-
- name: $CI_REGISTRY_GO/docker:20.10.5-dind
98+
- name: $CI_REGISTRY_GO/docker:24.0-dind
9999
alias: docker
100100
variables:
101101
LOCAL_IP_ADDRESS: docker

e2e/run.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ major="${version_parts[0]}"
4949
minor="${version_parts[1]}"
5050

5151
if [[ "$major" -eq "2" && "$minor" -ge "7" || "$major" -gt "2" ]] ; then
52-
echo "Running<<<<<<<<<<< master socket"
5352
HAPROXY_FLAGS="-W -db -S /var/lib/haproxy/master -f /usr/local/etc/haproxy/haproxy.cfg"
5453
VARIANT="-master-socket"
5554
fi
@@ -63,6 +62,7 @@ else
6362
--detach \
6463
--name ${DOCKER_CONTAINER_NAME} \
6564
--publish "${E2E_PORT}":8080 \
65+
--security-opt seccomp=unconfined \
6666
"${DOCKER_BASE_IMAGE}" $HAPROXY_FLAGS > /dev/null 2>&1
6767
docker cp "${ROOT_DIR}/build/dataplaneapi" ${DOCKER_CONTAINER_NAME}:/usr/local/bin/dataplaneapi
6868
docker cp "${E2E_DIR}/fixtures/dataplaneapi${VARIANT}.yaml" ${DOCKER_CONTAINER_NAME}:/etc/haproxy/dataplaneapi.yaml

0 commit comments

Comments
 (0)