-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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>
- Loading branch information
Showing
5 changed files
with
15 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
# syntax=docker/dockerfile:1 | ||
|
||
ARG PYTHON_VERSION=3.10 | ||
|
||
FROM python:${PYTHON_VERSION} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
# syntax=docker/dockerfile:1 | ||
|
||
ARG PYTHON_VERSION=3.10 | ||
|
||
FROM python:${PYTHON_VERSION} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
# syntax=docker/dockerfile:1 | ||
|
||
ARG PYTHON_VERSION=3.10 | ||
|
||
FROM python:${PYTHON_VERSION} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |