Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump Dockerfile base image to docker 24.0.7 #16

Merged
merged 2 commits into from
Dec 22, 2023
Merged

bump Dockerfile base image to docker 24.0.7 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1decdc8
bump Dockerfile base image to docker 24.0.7
ksurl Dec 21, 2023
c420a2b
update docker base image and compose command in tests
ksurl Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker:20.10.11
FROM docker:24.0.7

RUN apk add --no-cache bash iproute2 iptables tzdata

Expand Down
5 changes: 1 addition & 4 deletions test/containers/trafficjam_test/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
FROM docker:20.10.11-dind
FROM docker:24.0.7-dind

ARG BATS_VER=v1.8.0
ARG DOCKER_COMPOSE_VER=v2.0.1

#Install Testing Dependencies
RUN apk add --no-cache iptables git bash curl && \
curl -SL https://github.com/docker/compose/releases/download/v2.0.1/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose && \
chmod a+x /usr/local/bin/docker-compose && \
git clone --depth 1 --branch $BATS_VER https://github.com/bats-core/bats-core.git /opt/bats && \
/opt/bats/install.sh /usr/local

Expand Down
6 changes: 3 additions & 3 deletions test/test-dind.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ setup_file() {
fi
sleep 5
done
docker-compose -f /opt/trafficjam/test/docker-compose-dind.yml up -d
docker compose -f /opt/trafficjam/test/docker-compose-dind.yml up -d
docker exec traefik apk add --no-cache curl
}

Expand Down Expand Up @@ -72,9 +72,9 @@ setup_file() {
}

@test "deploy with ALLOW_HOST_TRAFFIC" {
docker-compose -f /opt/trafficjam/test/docker-compose-dind.yml down
docker compose -f /opt/trafficjam/test/docker-compose-dind.yml down
sleep 5
docker-compose -f /opt/trafficjam/test/docker-compose-dind-allowhost.yml up -d
docker compose -f /opt/trafficjam/test/docker-compose-dind-allowhost.yml up -d
}

@test "containers can communicate via host-mapped ports (public1)" {
Expand Down
Loading