Template all of the files required for auto-generation into one place…

… to remove redundancy and repeated entries
DockerToolbox · May 25, 2021 · 0d52252 · 0d52252
1 parent d8059a3
commit 0d52252
Show file tree

Hide file tree

Showing 66 changed files with 82 additions and 155 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,11 +5,15 @@ All notable changes to this project will be documented in this file.
 
 This changelog was automatically generated using [Caretaker](https://github.com/DevelopersToolbox/caretaker) by [Wolf Software](https://github.com/WolfSoftware)
 
-### [Unreleased](https://github.com/DockerToolbox/goenv/compare/v0.1.1...HEAD)
+### [v0.1.2](https://github.com/DockerToolbox/goenv/compare/v0.1.1...v0.1.2)
 
-- Minor tweaks to the auto-generation [`[head]`](https://github.com/DockerToolbox/goenv/commit/)
+> Released on May, 25th 2021
 
-### [v0.1.0](https://github.com/DockerToolbox/goenv/releases/v0.1.0)
+- Template all of the files required for auto-generation into one place to remove redundancy and repeated entries [`[head]`](https://github.com/DockerToolbox/goenv/commit/)
+
+- Minor tweaks to the auto-generation [`[d8059a3]`](https://github.com/DockerToolbox/goenv/commit/d8059a322cdda684b77183cab81b7f8b6e07073a)
+
+### [v0.1.1](https://github.com/DockerToolbox/goenv/compare/v0.1.0...v0.1.1)
 
 > Released on May, 24th 2021
 
@@ -19,5 +23,9 @@ This changelog was automatically generated using [Caretaker](https://github.com/
 
 - Fix travis rvm versions and slack integration [`[a987387]`](https://github.com/DockerToolbox/goenv/commit/a987387d86fe6c13b9311a3fba9f8a235234e6fd)
 
+### [v0.1.0](https://github.com/DockerToolbox/goenv/releases/v0.1.0)
+
+> Released on February, 19th 2021
+
 - The initial commit [`[63bdd44]`](https://github.com/DockerToolbox/goenv/commit/63bdd447ef11b36777bb0f395024ddb8cf593625)
 
diff --git a/Dockerfiles/amazonlinux/1/Dockerfile b/Dockerfiles/amazonlinux/1/Dockerfile
@@ -15,7 +15,9 @@ RUN yum makecache && \
 	echo 'eval "$(goenv init -)"' >> ~/.bashrc && \
 	echo 'export PATH=${GOROOT}/bin:${PATH}' >> ~/.bashrc && \
 	echo 'export PATH=${GOPATH}/bin:${PATH}' >> ~/.bashrc && \
-	yum autoremove -y && \
+	yum remove -y --remove-leaves \
+		git \
+		&& \
 	yum clean all && \
 	rm -rf /var/cache/yum
 

diff --git a/Dockerfiles/amazonlinux/1/Templates/cleanup.tpl b/Dockerfiles/amazonlinux/1/Templates/cleanup.tpl
diff --git a/Dockerfiles/amazonlinux/1/Templates/cleanup.tpl b/Dockerfiles/amazonlinux/1/Templates/cleanup.tpl
@@ -0,0 +1 @@
+../../../../Templates/yum-cleanup-with-leaves.tpl
diff --git a/Dockerfiles/amazonlinux/1/Templates/entrypoint.tpl b/Dockerfiles/amazonlinux/1/Templates/entrypoint.tpl
diff --git a/Dockerfiles/amazonlinux/1/Templates/entrypoint.tpl b/Dockerfiles/amazonlinux/1/Templates/entrypoint.tpl
@@ -0,0 +1 @@
+../../../../Templates/entrypoint.tpl
diff --git a/Dockerfiles/amazonlinux/1/Templates/install.tpl b/Dockerfiles/amazonlinux/1/Templates/install.tpl
@@ -1 +1 @@
-../../../../Scripts/install.tpl
+../../../../Templates/install.tpl
diff --git a/Dockerfiles/amazonlinux/1/Templates/lint.tpl b/Dockerfiles/amazonlinux/1/Templates/lint.tpl
diff --git a/Dockerfiles/amazonlinux/2/Dockerfile b/Dockerfiles/amazonlinux/2/Dockerfile
@@ -15,7 +15,9 @@ RUN yum makecache && \
 	echo 'eval "$(goenv init -)"' >> ~/.bashrc && \
 	echo 'export PATH=${GOROOT}/bin:${PATH}' >> ~/.bashrc && \
 	echo 'export PATH=${GOPATH}/bin:${PATH}' >> ~/.bashrc && \
-	yum autoremove -y && \
+	yum remove -y --remove-leaves \
+		git \
+		&& \
 	yum clean all && \
 	rm -rf /var/cache/yum
 

diff --git a/Dockerfiles/amazonlinux/2/Templates/cleanup.tpl b/Dockerfiles/amazonlinux/2/Templates/cleanup.tpl
diff --git a/Dockerfiles/amazonlinux/2/Templates/cleanup.tpl b/Dockerfiles/amazonlinux/2/Templates/cleanup.tpl
@@ -0,0 +1 @@
+../../../../Templates/yum-cleanup-with-leaves.tpl
diff --git a/Dockerfiles/amazonlinux/2/Templates/entrypoint.tpl b/Dockerfiles/amazonlinux/2/Templates/entrypoint.tpl
diff --git a/Dockerfiles/amazonlinux/2/Templates/entrypoint.tpl b/Dockerfiles/amazonlinux/2/Templates/entrypoint.tpl
@@ -0,0 +1 @@
+../../../../Templates/entrypoint.tpl
diff --git a/Dockerfiles/amazonlinux/2/Templates/install.tpl b/Dockerfiles/amazonlinux/2/Templates/install.tpl
@@ -1 +1 @@
-../../../../Scripts/install.tpl
+../../../../Templates/install.tpl
diff --git a/Dockerfiles/amazonlinux/2/Templates/lint.tpl b/Dockerfiles/amazonlinux/2/Templates/lint.tpl
diff --git a/Dockerfiles/centos/7/Templates/cleanup.tpl b/Dockerfiles/centos/7/Templates/cleanup.tpl
diff --git a/Dockerfiles/centos/7/Templates/cleanup.tpl b/Dockerfiles/centos/7/Templates/cleanup.tpl
@@ -0,0 +1 @@
+../../../../Templates/yum-cleanup-with-leaves.tpl
diff --git a/Dockerfiles/centos/7/Templates/entrypoint.tpl b/Dockerfiles/centos/7/Templates/entrypoint.tpl
diff --git a/Dockerfiles/centos/7/Templates/entrypoint.tpl b/Dockerfiles/centos/7/Templates/entrypoint.tpl
@@ -0,0 +1 @@
+../../../../Templates/entrypoint.tpl
diff --git a/Dockerfiles/centos/7/Templates/install.tpl b/Dockerfiles/centos/7/Templates/install.tpl
@@ -1 +1 @@
-../../../../Scripts/install.tpl
+../../../../Templates/install.tpl
diff --git a/Dockerfiles/centos/7/Templates/lint.tpl b/Dockerfiles/centos/7/Templates/lint.tpl
diff --git a/Dockerfiles/centos/8/Templates/cleanup.tpl b/Dockerfiles/centos/8/Templates/cleanup.tpl
diff --git a/Dockerfiles/centos/8/Templates/cleanup.tpl b/Dockerfiles/centos/8/Templates/cleanup.tpl
@@ -0,0 +1 @@
+../../../../Templates/yum-cleanup.tpl
diff --git a/Dockerfiles/centos/8/Templates/entrypoint.tpl b/Dockerfiles/centos/8/Templates/entrypoint.tpl
diff --git a/Dockerfiles/centos/8/Templates/entrypoint.tpl b/Dockerfiles/centos/8/Templates/entrypoint.tpl
@@ -0,0 +1 @@
+../../../../Templates/entrypoint.tpl
diff --git a/Dockerfiles/centos/8/Templates/install.tpl b/Dockerfiles/centos/8/Templates/install.tpl
@@ -1 +1 @@
-../../../../Scripts/install.tpl
+../../../../Templates/install.tpl
diff --git a/Dockerfiles/centos/8/Templates/lint.tpl b/Dockerfiles/centos/8/Templates/lint.tpl
diff --git a/Dockerfiles/debian/10-slim/Templates/cleanup.tpl b/Dockerfiles/debian/10-slim/Templates/cleanup.tpl
diff --git a/Dockerfiles/debian/10-slim/Templates/cleanup.tpl b/Dockerfiles/debian/10-slim/Templates/cleanup.tpl
@@ -0,0 +1 @@
+../../../../Templates/apt-cleanup.tpl
diff --git a/Dockerfiles/debian/10-slim/Templates/entrypoint.tpl b/Dockerfiles/debian/10-slim/Templates/entrypoint.tpl
diff --git a/Dockerfiles/debian/10-slim/Templates/entrypoint.tpl b/Dockerfiles/debian/10-slim/Templates/entrypoint.tpl
@@ -0,0 +1 @@
+../../../../Templates/entrypoint.tpl
diff --git a/Dockerfiles/debian/10-slim/Templates/install.tpl b/Dockerfiles/debian/10-slim/Templates/install.tpl
@@ -1 +1 @@
-../../../../Scripts/install.tpl
+../../../../Templates/install.tpl
diff --git a/Dockerfiles/debian/10-slim/Templates/lint.tpl b/Dockerfiles/debian/10-slim/Templates/lint.tpl
diff --git a/Dockerfiles/debian/10/Templates/cleanup.tpl b/Dockerfiles/debian/10/Templates/cleanup.tpl
diff --git a/Dockerfiles/debian/10/Templates/cleanup.tpl b/Dockerfiles/debian/10/Templates/cleanup.tpl
@@ -0,0 +1 @@
+../../../../Templates/apt-cleanup.tpl
diff --git a/Dockerfiles/debian/10/Templates/entrypoint.tpl b/Dockerfiles/debian/10/Templates/entrypoint.tpl
diff --git a/Dockerfiles/debian/10/Templates/entrypoint.tpl b/Dockerfiles/debian/10/Templates/entrypoint.tpl
@@ -0,0 +1 @@
+../../../../Templates/entrypoint.tpl
diff --git a/Dockerfiles/debian/10/Templates/install.tpl b/Dockerfiles/debian/10/Templates/install.tpl
@@ -1 +1 @@
-../../../../Scripts/install.tpl
+../../../../Templates/install.tpl
diff --git a/Dockerfiles/debian/10/Templates/lint.tpl b/Dockerfiles/debian/10/Templates/lint.tpl
diff --git a/Dockerfiles/debian/11-slim/Templates/cleanup.tpl b/Dockerfiles/debian/11-slim/Templates/cleanup.tpl
diff --git a/Dockerfiles/debian/11-slim/Templates/cleanup.tpl b/Dockerfiles/debian/11-slim/Templates/cleanup.tpl
@@ -0,0 +1 @@
+../../../../Templates/apt-cleanup.tpl
diff --git a/Dockerfiles/debian/11-slim/Templates/entrypoint.tpl b/Dockerfiles/debian/11-slim/Templates/entrypoint.tpl
diff --git a/Dockerfiles/debian/11-slim/Templates/entrypoint.tpl b/Dockerfiles/debian/11-slim/Templates/entrypoint.tpl
@@ -0,0 +1 @@
+../../../../Templates/entrypoint.tpl
diff --git a/Dockerfiles/debian/11-slim/Templates/install.tpl b/Dockerfiles/debian/11-slim/Templates/install.tpl
@@ -1 +1 @@
-../../../../Scripts/install.tpl
+../../../../Templates/install.tpl
diff --git a/Dockerfiles/debian/11-slim/Templates/lint.tpl b/Dockerfiles/debian/11-slim/Templates/lint.tpl
diff --git a/Dockerfiles/debian/11/Templates/cleanup.tpl b/Dockerfiles/debian/11/Templates/cleanup.tpl
diff --git a/Dockerfiles/debian/11/Templates/cleanup.tpl b/Dockerfiles/debian/11/Templates/cleanup.tpl
@@ -0,0 +1 @@
+../../../../Templates/apt-cleanup.tpl
diff --git a/Dockerfiles/debian/11/Templates/entrypoint.tpl b/Dockerfiles/debian/11/Templates/entrypoint.tpl
diff --git a/Dockerfiles/debian/11/Templates/entrypoint.tpl b/Dockerfiles/debian/11/Templates/entrypoint.tpl
@@ -0,0 +1 @@
+../../../../Templates/entrypoint.tpl
diff --git a/Dockerfiles/debian/11/Templates/install.tpl b/Dockerfiles/debian/11/Templates/install.tpl
@@ -1 +1 @@
-../../../../Scripts/install.tpl
+../../../../Templates/install.tpl
diff --git a/Dockerfiles/debian/11/Templates/lint.tpl b/Dockerfiles/debian/11/Templates/lint.tpl
diff --git a/Dockerfiles/debian/9-slim/Templates/cleanup.tpl b/Dockerfiles/debian/9-slim/Templates/cleanup.tpl
diff --git a/Dockerfiles/debian/9-slim/Templates/cleanup.tpl b/Dockerfiles/debian/9-slim/Templates/cleanup.tpl
@@ -0,0 +1 @@
+../../../../Templates/apt-cleanup.tpl
diff --git a/Dockerfiles/debian/9-slim/Templates/entrypoint.tpl b/Dockerfiles/debian/9-slim/Templates/entrypoint.tpl
diff --git a/Dockerfiles/debian/9-slim/Templates/entrypoint.tpl b/Dockerfiles/debian/9-slim/Templates/entrypoint.tpl
@@ -0,0 +1 @@
+../../../../Templates/entrypoint.tpl
diff --git a/Dockerfiles/debian/9-slim/Templates/install.tpl b/Dockerfiles/debian/9-slim/Templates/install.tpl
@@ -1 +1 @@
-../../../../Scripts/install.tpl
+../../../../Templates/install.tpl
diff --git a/Dockerfiles/debian/9-slim/Templates/lint.tpl b/Dockerfiles/debian/9-slim/Templates/lint.tpl
diff --git a/Dockerfiles/debian/9/Templates/cleanup.tpl b/Dockerfiles/debian/9/Templates/cleanup.tpl
diff --git a/Dockerfiles/debian/9/Templates/cleanup.tpl b/Dockerfiles/debian/9/Templates/cleanup.tpl
@@ -0,0 +1 @@
+../../../../Templates/apt-cleanup.tpl
diff --git a/Dockerfiles/debian/9/Templates/entrypoint.tpl b/Dockerfiles/debian/9/Templates/entrypoint.tpl
diff --git a/Dockerfiles/debian/9/Templates/entrypoint.tpl b/Dockerfiles/debian/9/Templates/entrypoint.tpl
@@ -0,0 +1 @@
+../../../../Templates/entrypoint.tpl
diff --git a/Dockerfiles/debian/9/Templates/install.tpl b/Dockerfiles/debian/9/Templates/install.tpl
@@ -1 +1 @@
-../../../../Scripts/install.tpl
+../../../../Templates/install.tpl
diff --git a/Dockerfiles/debian/9/Templates/lint.tpl b/Dockerfiles/debian/9/Templates/lint.tpl
diff --git a/Dockerfiles/ubuntu/16.04/Dockerfile b/Dockerfiles/ubuntu/16.04/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update && \
 	apt-get -y remove --purge \
 		git \
 		&& \
-	apt-get -y auto-remove && \
+	apt-get -y autoremove && \
 	rm -rf /var/lib/apt/lists/*
 
 WORKDIR /root

diff --git a/Dockerfiles/ubuntu/16.04/Templates/cleanup.tpl b/Dockerfiles/ubuntu/16.04/Templates/cleanup.tpl
diff --git a/Dockerfiles/ubuntu/16.04/Templates/cleanup.tpl b/Dockerfiles/ubuntu/16.04/Templates/cleanup.tpl
@@ -0,0 +1 @@
+../../../../Templates/apt-cleanup.tpl
diff --git a/Dockerfiles/ubuntu/16.04/Templates/entrypoint.tpl b/Dockerfiles/ubuntu/16.04/Templates/entrypoint.tpl
diff --git a/Dockerfiles/ubuntu/16.04/Templates/entrypoint.tpl b/Dockerfiles/ubuntu/16.04/Templates/entrypoint.tpl
@@ -0,0 +1 @@
+../../../../Templates/entrypoint.tpl
diff --git a/Dockerfiles/ubuntu/16.04/Templates/install.tpl b/Dockerfiles/ubuntu/16.04/Templates/install.tpl
@@ -1 +1 @@
-../../../../Scripts/install.tpl
+../../../../Templates/install.tpl
diff --git a/Dockerfiles/ubuntu/16.04/Templates/lint.tpl b/Dockerfiles/ubuntu/16.04/Templates/lint.tpl
diff --git a/Dockerfiles/ubuntu/18.04/Dockerfile b/Dockerfiles/ubuntu/18.04/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update && \
 	apt-get -y remove --purge \
 		git \
 		&& \
-	apt-get -y auto-remove && \
+	apt-get -y autoremove && \
 	rm -rf /var/lib/apt/lists/*
 
 WORKDIR /root

diff --git a/Dockerfiles/ubuntu/18.04/Templates/cleanup.tpl b/Dockerfiles/ubuntu/18.04/Templates/cleanup.tpl
diff --git a/Dockerfiles/ubuntu/18.04/Templates/cleanup.tpl b/Dockerfiles/ubuntu/18.04/Templates/cleanup.tpl
@@ -0,0 +1 @@
+../../../../Templates/apt-cleanup.tpl
diff --git a/Dockerfiles/ubuntu/18.04/Templates/entrypoint.tpl b/Dockerfiles/ubuntu/18.04/Templates/entrypoint.tpl
diff --git a/Dockerfiles/ubuntu/18.04/Templates/entrypoint.tpl b/Dockerfiles/ubuntu/18.04/Templates/entrypoint.tpl
@@ -0,0 +1 @@
+../../../../Templates/entrypoint.tpl
diff --git a/Dockerfiles/ubuntu/18.04/Templates/install.tpl b/Dockerfiles/ubuntu/18.04/Templates/install.tpl
@@ -1 +1 @@
-../../../../Scripts/install.tpl
+../../../../Templates/install.tpl
diff --git a/Dockerfiles/ubuntu/18.04/Templates/lint.tpl b/Dockerfiles/ubuntu/18.04/Templates/lint.tpl
diff --git a/Dockerfiles/ubuntu/20.04/Dockerfile b/Dockerfiles/ubuntu/20.04/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update && \
 	apt-get -y remove --purge \
 		git \
 		&& \
-	apt-get -y auto-remove && \
+	apt-get -y autoremove && \
 	rm -rf /var/lib/apt/lists/*
 
 WORKDIR /root

diff --git a/Dockerfiles/ubuntu/20.04/Templates/cleanup.tpl b/Dockerfiles/ubuntu/20.04/Templates/cleanup.tpl
diff --git a/Dockerfiles/ubuntu/20.04/Templates/cleanup.tpl b/Dockerfiles/ubuntu/20.04/Templates/cleanup.tpl
@@ -0,0 +1 @@
+../../../../Templates/apt-cleanup.tpl
diff --git a/Dockerfiles/ubuntu/20.04/Templates/entrypoint.tpl b/Dockerfiles/ubuntu/20.04/Templates/entrypoint.tpl
diff --git a/Dockerfiles/ubuntu/20.04/Templates/entrypoint.tpl b/Dockerfiles/ubuntu/20.04/Templates/entrypoint.tpl
@@ -0,0 +1 @@
+../../../../Templates/entrypoint.tpl
diff --git a/Dockerfiles/ubuntu/20.04/Templates/install.tpl b/Dockerfiles/ubuntu/20.04/Templates/install.tpl
@@ -1 +1 @@
-../../../../Scripts/install.tpl
+../../../../Templates/install.tpl
diff --git a/Dockerfiles/ubuntu/20.04/Templates/lint.tpl b/Dockerfiles/ubuntu/20.04/Templates/lint.tpl
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../../Templates/yum-cleanup-with-leaves.tpl
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../../../../Scripts/install.tpl
		../../../../Templates/install.tpl