mirror of https://github.com/docker/docker-py.git
ci: use latest stable syntax for Dockerfiles (#3035)
I noticed one Dockerfile was pinned to 1.4; given that there's a backward compatibility guarantee on the stable syntax, the general recommendation is to use `dockerfile:1`, which makes sure that the latest stable release of the Dockerfile syntax is pulled before building. While changing, I also made some minor changes to some Dockerfiles to reduce some unneeded layers. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
2494d63f36
commit
1c27ec1f0c
|
@ -1,3 +1,5 @@
|
||||||
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
ARG PYTHON_VERSION=3.10
|
ARG PYTHON_VERSION=3.10
|
||||||
|
|
||||||
FROM python:${PYTHON_VERSION}
|
FROM python:${PYTHON_VERSION}
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
ARG PYTHON_VERSION=3.10
|
ARG PYTHON_VERSION=3.10
|
||||||
|
|
||||||
FROM python:${PYTHON_VERSION}
|
FROM python:${PYTHON_VERSION}
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
# syntax = docker/dockerfile:1.4
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
ARG PYTHON_VERSION=3.10
|
ARG PYTHON_VERSION=3.10
|
||||||
|
|
||||||
FROM python:${PYTHON_VERSION}
|
FROM python:${PYTHON_VERSION}
|
||||||
|
|
||||||
ARG APT_MIRROR
|
ARG APT_MIRROR
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
ARG PYTHON_VERSION=3.10
|
ARG PYTHON_VERSION=3.10
|
||||||
|
|
||||||
FROM python:${PYTHON_VERSION}
|
FROM python:${PYTHON_VERSION}
|
||||||
|
|
|
@ -1,18 +1,20 @@
|
||||||
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
ARG API_VERSION=1.41
|
ARG API_VERSION=1.41
|
||||||
ARG ENGINE_VERSION=20.10
|
ARG ENGINE_VERSION=20.10
|
||||||
|
|
||||||
FROM docker:${ENGINE_VERSION}-dind
|
FROM docker:${ENGINE_VERSION}-dind
|
||||||
|
|
||||||
RUN apk add --no-cache --upgrade \
|
RUN apk add --no-cache --upgrade \
|
||||||
openssh
|
openssh
|
||||||
|
|
||||||
COPY tests/ssh/config/server /etc/ssh/
|
COPY tests/ssh/config/server /etc/ssh/
|
||||||
RUN chmod -R 600 /etc/ssh
|
|
||||||
|
|
||||||
# set authorized keys for client paswordless connection
|
# set authorized keys for client paswordless connection
|
||||||
COPY tests/ssh/config/client/id_rsa.pub /root/.ssh/authorized_keys
|
COPY tests/ssh/config/client/id_rsa.pub /root/.ssh/authorized_keys
|
||||||
RUN chmod -R 600 /root/.ssh
|
|
||||||
|
|
||||||
# RUN echo "root:root" | chpasswd
|
# RUN echo "root:root" | chpasswd
|
||||||
RUN ln -s /usr/local/bin/docker /usr/bin/docker
|
RUN chmod -R 600 /etc/ssh \
|
||||||
|
&& chmod -R 600 /root/.ssh \
|
||||||
|
&& ln -s /usr/local/bin/docker /usr/bin/docker
|
||||||
EXPOSE 22
|
EXPOSE 22
|
||||||
|
|
Loading…
Reference in New Issue