From 60d69673c3b0d5d705363b25818dab549b62c026 Mon Sep 17 00:00:00 2001 From: Smallwood MP Date: Mon, 7 Sep 2020 19:13:24 +0200 Subject: [PATCH 1/3] Remove MAINTAINER from Dockerfile --- cement/cli/templates/generate/project/Dockerfile | 1 - cement/cli/templates/generate/todo-tutorial/Dockerfile | 1 - 2 files changed, 2 deletions(-) diff --git a/cement/cli/templates/generate/project/Dockerfile b/cement/cli/templates/generate/project/Dockerfile index b0c65174..ea6b9bbe 100644 --- a/cement/cli/templates/generate/project/Dockerfile +++ b/cement/cli/templates/generate/project/Dockerfile @@ -1,5 +1,4 @@ FROM python:3.6-alpine -MAINTAINER {{ creator }} <{{ creator_email }}> ENV PS1="\[\e[0;33m\]|> {{ label }} <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " WORKDIR /src diff --git a/cement/cli/templates/generate/todo-tutorial/Dockerfile b/cement/cli/templates/generate/todo-tutorial/Dockerfile index 6089e3d1..d05a443e 100644 --- a/cement/cli/templates/generate/todo-tutorial/Dockerfile +++ b/cement/cli/templates/generate/todo-tutorial/Dockerfile @@ -1,5 +1,4 @@ FROM python:3.6-alpine -MAINTAINER Your Name ENV PS1="\[\e[0;33m\]|> todo <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " WORKDIR /src From d8c05ac37b3015b2aec358ac91bcfd889e12c947 Mon Sep 17 00:00:00 2001 From: Smallwood MP Date: Mon, 8 Mar 2021 22:09:17 +0100 Subject: [PATCH 2/3] Remove deprecated MAINTAINER in Dockerfiles and use LABEL instead --- Dockerfile | 2 +- cement/cli/templates/generate/project/Dockerfile | 1 + cement/cli/templates/generate/todo-tutorial/Dockerfile | 1 + docker/Dockerfile.dev-py35 | 2 +- docker/Dockerfile.dev-py37 | 2 +- docker/Dockerfile.dev-py38 | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 005da1f4..5b275df9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM python:3.8-alpine -MAINTAINER BJ Dierkes +LABEL MAINTAINER BJ Dierkes ENV PS1="\[\e[0;33m\]|> cement <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " WORKDIR /src COPY . /src diff --git a/cement/cli/templates/generate/project/Dockerfile b/cement/cli/templates/generate/project/Dockerfile index ea6b9bbe..fbe68e05 100644 --- a/cement/cli/templates/generate/project/Dockerfile +++ b/cement/cli/templates/generate/project/Dockerfile @@ -1,4 +1,5 @@ FROM python:3.6-alpine +LABEL MAINTAINER {{ creator }} <{{ creator_email }}> ENV PS1="\[\e[0;33m\]|> {{ label }} <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " WORKDIR /src diff --git a/cement/cli/templates/generate/todo-tutorial/Dockerfile b/cement/cli/templates/generate/todo-tutorial/Dockerfile index d05a443e..1ce3fe75 100644 --- a/cement/cli/templates/generate/todo-tutorial/Dockerfile +++ b/cement/cli/templates/generate/todo-tutorial/Dockerfile @@ -1,4 +1,5 @@ FROM python:3.6-alpine +LABEL MAINTAINER Your Name ENV PS1="\[\e[0;33m\]|> todo <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " WORKDIR /src diff --git a/docker/Dockerfile.dev-py35 b/docker/Dockerfile.dev-py35 index b2f3b445..443eb5bd 100644 --- a/docker/Dockerfile.dev-py35 +++ b/docker/Dockerfile.dev-py35 @@ -1,5 +1,5 @@ FROM python:3.5-alpine -MAINTAINER BJ Dierkes +LABEL MAINTAINER BJ Dierkes ENV PS1="\[\e[0;33m\]|> cement-py35 <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " WORKDIR /src diff --git a/docker/Dockerfile.dev-py37 b/docker/Dockerfile.dev-py37 index 6cb93f1e..28ce6f02 100644 --- a/docker/Dockerfile.dev-py37 +++ b/docker/Dockerfile.dev-py37 @@ -1,5 +1,5 @@ FROM python:3.7-alpine -MAINTAINER BJ Dierkes +LABEL MAINTAINER BJ Dierkes ENV PS1="\[\e[0;33m\]|> cement-py37 <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " WORKDIR /src diff --git a/docker/Dockerfile.dev-py38 b/docker/Dockerfile.dev-py38 index eafb302b..a3fc3aea 100644 --- a/docker/Dockerfile.dev-py38 +++ b/docker/Dockerfile.dev-py38 @@ -1,5 +1,5 @@ FROM python:3.8-alpine -MAINTAINER BJ Dierkes +LABEL MAINTAINER BJ Dierkes ENV PS1="\[\e[0;33m\]|> cement-py38 <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " WORKDIR /src From 12198c0aec43eddddfbd2798aae3590174ea89d5 Mon Sep 17 00:00:00 2001 From: Smallwood MP Date: Mon, 8 Mar 2021 22:28:20 +0100 Subject: [PATCH 3/3] Remove deprecated MAINTAINER in Dockerfiles and use LABEL instead --- Dockerfile | 2 +- cement/cli/templates/generate/project/Dockerfile | 2 +- cement/cli/templates/generate/todo-tutorial/Dockerfile | 2 +- docker/Dockerfile.dev | 2 +- docker/Dockerfile.dev-py35 | 2 +- docker/Dockerfile.dev-py36 | 2 +- docker/Dockerfile.dev-py37 | 2 +- docker/Dockerfile.dev-py38 | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5b275df9..8f829651 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM python:3.8-alpine -LABEL MAINTAINER BJ Dierkes +LABEL MAINTAINER="BJ Dierkes " ENV PS1="\[\e[0;33m\]|> cement <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " WORKDIR /src COPY . /src diff --git a/cement/cli/templates/generate/project/Dockerfile b/cement/cli/templates/generate/project/Dockerfile index fbe68e05..a9782596 100644 --- a/cement/cli/templates/generate/project/Dockerfile +++ b/cement/cli/templates/generate/project/Dockerfile @@ -1,5 +1,5 @@ FROM python:3.6-alpine -LABEL MAINTAINER {{ creator }} <{{ creator_email }}> +LABEL MAINTAINER="{{ creator }} <{{ creator_email }}>" ENV PS1="\[\e[0;33m\]|> {{ label }} <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " WORKDIR /src diff --git a/cement/cli/templates/generate/todo-tutorial/Dockerfile b/cement/cli/templates/generate/todo-tutorial/Dockerfile index 1ce3fe75..a59046ed 100644 --- a/cement/cli/templates/generate/todo-tutorial/Dockerfile +++ b/cement/cli/templates/generate/todo-tutorial/Dockerfile @@ -1,5 +1,5 @@ FROM python:3.6-alpine -LABEL MAINTAINER Your Name +LABEL MAINTAINER="Your Name " ENV PS1="\[\e[0;33m\]|> todo <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " WORKDIR /src diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index ee7a7360..89266436 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -1,5 +1,5 @@ FROM python:3.8-alpine -MAINTAINER BJ Dierkes +LABEL MAINTAINER="BJ Dierkes " ENV PS1="\[\e[0;33m\]|> cement <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " WORKDIR /src diff --git a/docker/Dockerfile.dev-py35 b/docker/Dockerfile.dev-py35 index 443eb5bd..df99e0ab 100644 --- a/docker/Dockerfile.dev-py35 +++ b/docker/Dockerfile.dev-py35 @@ -1,5 +1,5 @@ FROM python:3.5-alpine -LABEL MAINTAINER BJ Dierkes +LABEL MAINTAINER="BJ Dierkes " ENV PS1="\[\e[0;33m\]|> cement-py35 <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " WORKDIR /src diff --git a/docker/Dockerfile.dev-py36 b/docker/Dockerfile.dev-py36 index 99547ac3..95017adb 100644 --- a/docker/Dockerfile.dev-py36 +++ b/docker/Dockerfile.dev-py36 @@ -1,5 +1,5 @@ FROM python:3.6-alpine -MAINTAINER BJ Dierkes +LABEL MAINTAINER="BJ Dierkes " ENV PS1="\[\e[0;33m\]|> cement-py36 <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " WORKDIR /src diff --git a/docker/Dockerfile.dev-py37 b/docker/Dockerfile.dev-py37 index 28ce6f02..04058847 100644 --- a/docker/Dockerfile.dev-py37 +++ b/docker/Dockerfile.dev-py37 @@ -1,5 +1,5 @@ FROM python:3.7-alpine -LABEL MAINTAINER BJ Dierkes +LABEL MAINTAINER="BJ Dierkes " ENV PS1="\[\e[0;33m\]|> cement-py37 <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " WORKDIR /src diff --git a/docker/Dockerfile.dev-py38 b/docker/Dockerfile.dev-py38 index a3fc3aea..bbaa732e 100644 --- a/docker/Dockerfile.dev-py38 +++ b/docker/Dockerfile.dev-py38 @@ -1,5 +1,5 @@ FROM python:3.8-alpine -LABEL MAINTAINER BJ Dierkes +LABEL MAINTAINER="BJ Dierkes " ENV PS1="\[\e[0;33m\]|> cement-py38 <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " WORKDIR /src