fix: remove Dockerfile labels

markosamuli · Nov 3, 2019 · 88f6f71 · 88f6f71
1 parent 9fd87a9
commit 88f6f71
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 21 deletions.
diff --git a/tests/Dockerfile.template b/tests/Dockerfile.template
@@ -1,8 +1,5 @@
 FROM %%FROM%%
 
-LABEL name="%%LABEL_NAME%%"
-LABEL version="%%LABEL_VERSION%%"
-
 RUN apt-get update && apt-get install -y \
     python-minimal \
     python-pip \

diff --git a/tests/bionic/Dockerfile b/tests/bionic/Dockerfile
@@ -1,8 +1,5 @@
 FROM ubuntu:bionic
 
-LABEL name="ansible-nvm-bionic"
-LABEL version="2019-11-03"
-
 RUN apt-get update && apt-get install -y \
     python-minimal \
     python-pip \

diff --git a/tests/buster/Dockerfile b/tests/buster/Dockerfile
@@ -1,8 +1,5 @@
 FROM debian:buster
 
-LABEL name="ansible-nvm-buster"
-LABEL version="2019-11-03"
-
 RUN apt-get update && apt-get install -y \
     python-minimal \
     python-pip \

diff --git a/tests/stretch/Dockerfile b/tests/stretch/Dockerfile
@@ -1,8 +1,5 @@
 FROM debian:stretch
 
-LABEL name="ansible-nvm-stretch"
-LABEL version="2019-11-03"
-
 RUN apt-get update && apt-get install -y \
     python-minimal \
     python-pip \

diff --git a/tests/update b/tests/update
@@ -12,31 +12,25 @@ cd "$DIR"
 user="test"
 repository="${ROLE_NAME}"
 ansible_version="==2.8.5"
-label_version=$(date +"%Y-%m-%d")
 
 # Generate Dockerfile from Dockerfile.template
 update_docker_image() {
     local docker_image=$1
     local docker_tag=$2
     dir="${docker_tag}"
-    label_name="${repository}-${docker_tag}"
     echo "*** Updating $dir/Dockerfile"
     mkdir -p "$dir"
     if test "$(uname)" = "Darwin"; then
         sed -E \
             -e 's!%%FROM%%!'"$docker_image:$docker_tag"'!g' \
             -e 's!%%USER%%!'"$user"'!g' \
-            -e 's!%%LABEL_NAME%%!'"$label_name"'!g' \
-            -e 's!%%LABEL_VERSION%%!'"$label_version"'!g' \
             -e 's!%%REPOSITORY%%!'"$repository"'!g' \
             -e 's!%%ANSIBLE_VERSION%%!'"$ansible_version"'!g' \
             "Dockerfile.template" >"$dir/Dockerfile"
     else
         sed -r \
             -e 's!%%FROM%%!'"$docker_image:$docker_tag"'!g' \
             -e 's!%%USER%%!'"$user"'!g' \
-            -e 's!%%LABEL_NAME%%!'"$label_name"'!g' \
-            -e 's!%%LABEL_VERSION%%!'"$label_version"'!g' \
             -e 's!%%REPOSITORY%%!'"$repository"'!g' \
             -e 's!%%ANSIBLE_VERSION%%!'"$ansible_version"'!g' \
             "Dockerfile.template" >"$dir/Dockerfile"

diff --git a/tests/xenial/Dockerfile b/tests/xenial/Dockerfile
@@ -1,8 +1,5 @@
 FROM ubuntu:xenial
 
-LABEL name="ansible-nvm-xenial"
-LABEL version="2019-11-03"
-
 RUN apt-get update && apt-get install -y \
     python-minimal \
     python-pip \