more recent buildx, from docker/buildx-bin to simplify build

main
Jerome Gravel-Niquet 2022-06-30 09:50:01 -04:00
parent 33a6c04d19
commit 627b605716
No known key found for this signature in database
GPG Key ID: B0E975C163F54F69
2 changed files with 7 additions and 10 deletions

View File

@ -1,10 +1,4 @@
FROM alpine as buildx FROM docker/buildx-bin:v0.8 as buildx
RUN apk add curl jq
RUN mkdir -p /root/.docker/cli-plugins
RUN curl -L https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-amd64 > /root/.docker/cli-plugins/docker-buildx
RUN chmod a+x /root/.docker/cli-plugins/docker-buildx
FROM docker:20 FROM docker:20
@ -12,7 +6,7 @@ RUN apk add bash ip6tables pigz sysstat procps lsof
COPY etc/docker/daemon.json /etc/docker/daemon.json COPY etc/docker/daemon.json /etc/docker/daemon.json
COPY --from=buildx /root/.docker /root/.docker COPY --from=buildx /buildx /root/.docker/cli-plugins/docker-buildx
COPY ./entrypoint ./entrypoint COPY ./entrypoint ./entrypoint
COPY ./docker-entrypoint.d/* ./docker-entrypoint.d/ COPY ./docker-entrypoint.d/* ./docker-entrypoint.d/
@ -21,4 +15,4 @@ ENV DOCKER_TMPDIR=/data/docker/tmp
ENTRYPOINT ["./entrypoint"] ENTRYPOINT ["./entrypoint"]
CMD ["dockerd", "-p", "/var/run/docker.pid", "--tls=false"] CMD ["dockerd", "-p", "/var/run/docker.pid"]

View File

@ -1,6 +1,8 @@
{ {
"data-root": "/data/docker", "data-root": "/data/docker",
"experimental": true,
"ipv6": true, "ipv6": true,
"ip6tables": true,
"fixed-cidr-v6": "2001:db8:1::/64", "fixed-cidr-v6": "2001:db8:1::/64",
"default-address-pools": [ "default-address-pools": [
{ {
@ -20,5 +22,6 @@
"mtu": 1400, "mtu": 1400,
"max-concurrent-downloads": 10, "max-concurrent-downloads": 10,
"max-concurrent-uploads": 5, "max-concurrent-uploads": 5,
"metrics-addr": "0.0.0.0:9323" "metrics-addr": "0.0.0.0:9323",
"tls": false
} }