Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use latest stable syntax for Dockerfiles #3035

Merged
merged 1 commit into from
Aug 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Dockerfile
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}
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile-docs
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}
Expand Down
4 changes: 3 additions & 1 deletion tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# syntax = docker/dockerfile:1.4
# syntax=docker/dockerfile:1
milas marked this conversation as resolved.
Show resolved Hide resolved
milas marked this conversation as resolved.
Show resolved Hide resolved

ARG PYTHON_VERSION=3.10

FROM python:${PYTHON_VERSION}

ARG APT_MIRROR
Expand Down
2 changes: 2 additions & 0 deletions tests/Dockerfile-dind-certs
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}
Expand Down
10 changes: 6 additions & 4 deletions tests/Dockerfile-ssh-dind
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