Skip to content

Commit

Permalink
CI: update Docker to v23.0.0-rc.1
Browse files Browse the repository at this point in the history
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
  • Loading branch information
AkihiroSuda committed Jan 4, 2023
1 parent b0b2d55 commit 17d897f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Expand Up @@ -100,7 +100,7 @@ jobs:
- name: "Check out"
uses: actions/checkout@v3
- name: "Build integration test image"
run: DOCKER_BUILDKIT=1 docker build -t rootlesskit:test-integration-docker --target test-integration-docker --build-arg GO_VERSION=1.18 .
run: DOCKER_BUILDKIT=1 docker build -t rootlesskit:test-integration-docker --target test-integration-docker .
- name: "Create a custom network to avoid IP confusion"
run: docker network create custom
- name: "Docker Integration test: net=slirp4netns, port-driver=builtin"
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile
Expand Up @@ -3,7 +3,8 @@ ARG UBUNTU_VERSION=20.04
ARG SHADOW_VERSION=4.8.1
ARG SLIRP4NETNS_VERSION=v1.2.0
ARG VPNKIT_VERSION=0.5.0
ARG DOCKER_VERSION=20.10.21
ARG DOCKER_VERSION=23.0.0-rc.1
ARG DOCKER_CHANNEL=test

FROM golang:${GO_VERSION}-alpine AS build
RUN apk add --no-cache file git make
Expand Down Expand Up @@ -79,7 +80,8 @@ WORKDIR /home/user/hack
FROM test-integration AS test-integration-docker
COPY --from=artifact /rootlesskit-docker-proxy /home/user/bin/
ARG DOCKER_VERSION
RUN curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz | tar xz --strip-components=1 -C /home/user/bin/
ARG DOCKER_CHANNEL
RUN curl -fsSL https://download.docker.com/linux/static/${DOCKER_CHANNEL}/x86_64/docker-${DOCKER_VERSION}.tgz | tar xz --strip-components=1 -C /home/user/bin/
RUN curl -fsSL -o /home/user/bin/dockerd-rootless.sh https://raw.githubusercontent.com/moby/moby/v${DOCKER_VERSION}/contrib/dockerd-rootless.sh && \
chmod +x /home/user/bin/dockerd-rootless.sh
ENV DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns
Expand Down

0 comments on commit 17d897f

Please sign in to comment.