Skip to content

Commit

Permalink
ci: use latest stable syntax for Dockerfiles (#3035)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
thaJeztah committed Aug 19, 2022
1 parent 2494d63 commit 1c27ec1
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 5 deletions.
2 changes: 2 additions & 0 deletions Dockerfile
@@ -1,3 +1,5 @@
# syntax=docker/dockerfile:1

ARG PYTHON_VERSION=3.10

FROM python:${PYTHON_VERSION}
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile-docs
@@ -1,3 +1,5 @@
# syntax=docker/dockerfile:1

ARG PYTHON_VERSION=3.10

FROM python:${PYTHON_VERSION}
Expand Down
4 changes: 3 additions & 1 deletion 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
Expand Down
2 changes: 2 additions & 0 deletions tests/Dockerfile-dind-certs
@@ -1,3 +1,5 @@
# syntax=docker/dockerfile:1

ARG PYTHON_VERSION=3.10

FROM python:${PYTHON_VERSION}
Expand Down
10 changes: 6 additions & 4 deletions 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

0 comments on commit 1c27ec1

Please sign in to comment.