From 4888952a05375c02b45520dfdb3fb22dcb6638ad Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 19 Aug 2022 20:43:10 +0200 Subject: [PATCH] Use latest stable syntax for Dockerfiles 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 --- Dockerfile | 2 ++ Dockerfile-docs | 2 ++ tests/Dockerfile | 4 +++- tests/Dockerfile-dind-certs | 2 ++ tests/Dockerfile-ssh-dind | 10 ++++++---- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index ef9b886cd..3476c6d03 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + ARG PYTHON_VERSION=3.10 FROM python:${PYTHON_VERSION} diff --git a/Dockerfile-docs b/Dockerfile-docs index e993822b8..11adbfe85 100644 --- a/Dockerfile-docs +++ b/Dockerfile-docs @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + ARG PYTHON_VERSION=3.10 FROM python:${PYTHON_VERSION} diff --git a/tests/Dockerfile b/tests/Dockerfile index 2cac785d9..bf95cd6a3 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -1,5 +1,7 @@ -# syntax = docker/dockerfile:1.4 +# syntax=docker/dockerfile:1 + ARG PYTHON_VERSION=3.10 + FROM python:${PYTHON_VERSION} ARG APT_MIRROR diff --git a/tests/Dockerfile-dind-certs b/tests/Dockerfile-dind-certs index 6e711892c..288a340ab 100644 --- a/tests/Dockerfile-dind-certs +++ b/tests/Dockerfile-dind-certs @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + ARG PYTHON_VERSION=3.10 FROM python:${PYTHON_VERSION} diff --git a/tests/Dockerfile-ssh-dind b/tests/Dockerfile-ssh-dind index 22c707a07..0da15aa40 100644 --- a/tests/Dockerfile-ssh-dind +++ b/tests/Dockerfile-ssh-dind @@ -1,18 +1,20 @@ +# syntax=docker/dockerfile:1 + ARG API_VERSION=1.41 ARG ENGINE_VERSION=20.10 FROM docker:${ENGINE_VERSION}-dind RUN apk add --no-cache --upgrade \ - openssh + openssh COPY tests/ssh/config/server /etc/ssh/ -RUN chmod -R 600 /etc/ssh # set authorized keys for client paswordless connection COPY tests/ssh/config/client/id_rsa.pub /root/.ssh/authorized_keys -RUN chmod -R 600 /root/.ssh # 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