Minor tweaks to the auto-generation

DockerToolbox · May 25, 2021 · d8059a3 · d8059a3
1 parent 25d76e5
commit d8059a3
Show file tree

Hide file tree

Showing 15 changed files with 77 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,19 +5,19 @@ 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)
 
-### [v0.1.1](https://github.com/DockerToolbox/goenv/compare/v0.1.0...v0.1.1)
+### [Unreleased](https://github.com/DockerToolbox/goenv/compare/v0.1.1...HEAD)
+
+- Minor tweaks to the auto-generation [`[head]`](https://github.com/DockerToolbox/goenv/commit/)
+
+### [v0.1.0](https://github.com/DockerToolbox/goenv/releases/v0.1.0)
 
 > Released on May, 24th 2021
 
-- Added a new 'generate' option to auto-generate (update) the Dockerfiles [`[head]`](https://github.com/DockerToolbox/goenv/commit/)
+- Added a new 'generate' option to auto-generate (update) the Dockerfiles [`[25d76e5]`](https://github.com/DockerToolbox/goenv/commit/25d76e519fe0e9cc59e1c7746a1566b42538a8c0)
 
 - Update pinned packages [`[c949f22]`](https://github.com/DockerToolbox/goenv/commit/c949f22ab527350cf91033e64325c11b1416b8c5)
 
 - 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
@@ -1,12 +1,12 @@
 FROM amazonlinux:1
 
 # hadolint ignore=SC2016
-RUN yum makecache && \ 
-	yum install -y \ 
-		ca-certificates-2018.2.22 \ 
-		curl-7.61.1 \ 
-		git-2.18.5 \ 
-		tar-1.26 \ 
+RUN yum makecache && \
+	yum install -y \
+		ca-certificates-2018.2.22 \
+		curl-7.61.1 \
+		git-2.18.5 \
+		tar-1.26 \
 		yum-plugin-remove-with-leaves-1.1.31 \
 		&& \
 	git clone https://github.com/syndbg/goenv.git ~/.goenv && \

diff --git a/Dockerfiles/amazonlinux/2/Dockerfile b/Dockerfiles/amazonlinux/2/Dockerfile
@@ -1,12 +1,12 @@
 FROM amazonlinux:2
 
 # hadolint ignore=SC2016
-RUN yum makecache && \ 
-	yum install -y \ 
-		ca-certificates-2019.2.32 \ 
-		curl-7.61.1 \ 
-		git-2.23.4 \ 
-		tar-1.26 \ 
+RUN yum makecache && \
+	yum install -y \
+		ca-certificates-2019.2.32 \
+		curl-7.61.1 \
+		git-2.23.4 \
+		tar-1.26 \
 		yum-plugin-remove-with-leaves-1.1.31 \
 		&& \
 	git clone https://github.com/syndbg/goenv.git ~/.goenv && \

diff --git a/Dockerfiles/centos/7/Dockerfile b/Dockerfiles/centos/7/Dockerfile
@@ -1,12 +1,12 @@
 FROM centos:7
 
 # hadolint ignore=SC2016
-RUN yum makecache && \ 
-	yum install -y \ 
-		ca-certificates-2020.2.41 \ 
-		curl-7.29.0 \ 
-		git-1.8.3.1 \ 
-		tar-1.26 \ 
+RUN yum makecache && \
+	yum install -y \
+		ca-certificates-2020.2.41 \
+		curl-7.29.0 \
+		git-1.8.3.1 \
+		tar-1.26 \
 		yum-plugin-remove-with-leaves-1.1.31 \
 		&& \
 	git clone https://github.com/syndbg/goenv.git ~/.goenv && \

diff --git a/Dockerfiles/centos/8/Dockerfile b/Dockerfiles/centos/8/Dockerfile
@@ -1,11 +1,11 @@
 FROM centos:8
 
 # hadolint ignore=SC2016
-RUN yum makecache && \ 
-	yum install -y \ 
-		ca-certificates-2020.2.41 \ 
-		curl-7.61.1 \ 
-		git-2.27.0 \ 
+RUN yum makecache && \
+	yum install -y \
+		ca-certificates-2020.2.41 \
+		curl-7.61.1 \
+		git-2.27.0 \
 		tar-1.30 \
 		&& \
 	git clone https://github.com/syndbg/goenv.git ~/.goenv && \

diff --git a/Dockerfiles/debian/10-slim/Dockerfile b/Dockerfiles/debian/10-slim/Dockerfile
@@ -1,10 +1,10 @@
 FROM debian:buster-slim
 
 # hadolint ignore=SC2016
-RUN apt-get update && \ 
-	apt-get -y --no-install-recommends install \ 
-		ca-certificates=20200601~deb10u2 \ 
-		curl=7.64.0-4+deb10u2 \ 
+RUN apt-get update && \
+	apt-get -y --no-install-recommends install \
+		ca-certificates=20200601~deb10u2 \
+		curl=7.64.0-4+deb10u2 \
 		git=1:2.20.1-2+deb10u3 \
 		&& \
 	git clone https://github.com/syndbg/goenv.git ~/.goenv && \

diff --git a/Dockerfiles/debian/10/Dockerfile b/Dockerfiles/debian/10/Dockerfile
@@ -1,10 +1,10 @@
 FROM debian:buster
 
 # hadolint ignore=SC2016
-RUN apt-get update && \ 
-	apt-get -y --no-install-recommends install \ 
-		ca-certificates=20200601~deb10u2 \ 
-		curl=7.64.0-4+deb10u2 \ 
+RUN apt-get update && \
+	apt-get -y --no-install-recommends install \
+		ca-certificates=20200601~deb10u2 \
+		curl=7.64.0-4+deb10u2 \
 		git=1:2.20.1-2+deb10u3 \
 		&& \
 	git clone https://github.com/syndbg/goenv.git ~/.goenv && \

diff --git a/Dockerfiles/debian/11-slim/Dockerfile b/Dockerfiles/debian/11-slim/Dockerfile
@@ -1,10 +1,10 @@
 FROM debian:bullseye-slim
 
 # hadolint ignore=SC2016
-RUN apt-get update && \ 
-	apt-get -y --no-install-recommends install \ 
-		ca-certificates=20210119 \ 
-		curl=7.74.0-1.2 \ 
+RUN apt-get update && \
+	apt-get -y --no-install-recommends install \
+		ca-certificates=20210119 \
+		curl=7.74.0-1.2 \
 		git=1:2.30.2-1 \
 		&& \
 	git clone https://github.com/syndbg/goenv.git ~/.goenv && \

diff --git a/Dockerfiles/debian/11/Dockerfile b/Dockerfiles/debian/11/Dockerfile
@@ -1,10 +1,10 @@
 FROM debian:bullseye
 
 # hadolint ignore=SC2016
-RUN apt-get update && \ 
-	apt-get -y --no-install-recommends install \ 
-		ca-certificates=20210119 \ 
-		curl=7.74.0-1.2 \ 
+RUN apt-get update && \
+	apt-get -y --no-install-recommends install \
+		ca-certificates=20210119 \
+		curl=7.74.0-1.2 \
 		git=1:2.30.2-1 \
 		&& \
 	git clone https://github.com/syndbg/goenv.git ~/.goenv && \

diff --git a/Dockerfiles/debian/9-slim/Dockerfile b/Dockerfiles/debian/9-slim/Dockerfile
@@ -1,10 +1,10 @@
 FROM debian:stretch-slim
 
 # hadolint ignore=SC2016
-RUN apt-get update && \ 
-	apt-get -y --no-install-recommends install \ 
-		ca-certificates=20200601~deb9u2 \ 
-		curl=7.52.1-5+deb9u14 \ 
+RUN apt-get update && \
+	apt-get -y --no-install-recommends install \
+		ca-certificates=20200601~deb9u2 \
+		curl=7.52.1-5+deb9u14 \
 		git=1:2.11.0-3+deb9u7 \
 		&& \
 	git clone https://github.com/syndbg/goenv.git ~/.goenv && \

diff --git a/Dockerfiles/debian/9/Dockerfile b/Dockerfiles/debian/9/Dockerfile
@@ -1,10 +1,10 @@
 FROM debian:stretch
 
 # hadolint ignore=SC2016
-RUN apt-get update && \ 
-	apt-get -y --no-install-recommends install \ 
-		ca-certificates=20200601~deb9u2 \ 
-		curl=7.52.1-5+deb9u14 \ 
+RUN apt-get update && \
+	apt-get -y --no-install-recommends install \
+		ca-certificates=20200601~deb9u2 \
+		curl=7.52.1-5+deb9u14 \
 		git=1:2.11.0-3+deb9u7 \
 		&& \
 	git clone https://github.com/syndbg/goenv.git ~/.goenv && \

diff --git a/Dockerfiles/ubuntu/16.04/Dockerfile b/Dockerfiles/ubuntu/16.04/Dockerfile
@@ -1,10 +1,10 @@
 FROM ubuntu:16.04
 
 # hadolint ignore=SC2016
-RUN apt-get update && \ 
-	apt-get -y --no-install-recommends install \ 
-		ca-certificates=20210119~16.04.1 \ 
-		curl=7.47.0-1ubuntu2.19 \ 
+RUN apt-get update && \
+	apt-get -y --no-install-recommends install \
+		ca-certificates=20210119~16.04.1 \
+		curl=7.47.0-1ubuntu2.19 \
 		git=1:2.7.4-0ubuntu1.10 \
 		&& \
 	git clone https://github.com/syndbg/goenv.git ~/.goenv && \

diff --git a/Dockerfiles/ubuntu/18.04/Dockerfile b/Dockerfiles/ubuntu/18.04/Dockerfile
@@ -1,10 +1,10 @@
 FROM ubuntu:18.04
 
 # hadolint ignore=SC2016
-RUN apt-get update && \ 
-	apt-get -y --no-install-recommends install \ 
-		ca-certificates=20210119~18.04.1 \ 
-		curl=7.58.0-2ubuntu3.13 \ 
+RUN apt-get update && \
+	apt-get -y --no-install-recommends install \
+		ca-certificates=20210119~18.04.1 \
+		curl=7.58.0-2ubuntu3.13 \
 		git=1:2.17.1-1ubuntu0.8 \
 		&& \
 	git clone https://github.com/syndbg/goenv.git ~/.goenv && \

diff --git a/Dockerfiles/ubuntu/20.04/Dockerfile b/Dockerfiles/ubuntu/20.04/Dockerfile
@@ -1,10 +1,10 @@
 FROM ubuntu:20.04
 
 # hadolint ignore=SC2016
-RUN apt-get update && \ 
-	apt-get -y --no-install-recommends install \ 
-		ca-certificates=20210119~20.04.1 \ 
-		curl=7.68.0-1ubuntu2.5 \ 
+RUN apt-get update && \
+	apt-get -y --no-install-recommends install \
+		ca-certificates=20210119~20.04.1 \
+		curl=7.68.0-1ubuntu2.5 \
 		git=1:2.25.1-1ubuntu3.1 \
 		&& \
 	git clone https://github.com/syndbg/goenv.git ~/.goenv && \

diff --git a/Scripts/utils.sh b/Scripts/utils.sh
@@ -110,7 +110,18 @@ function generate_container()
     ENTRYPOINT=$(<Templates/entrypoint.tpl)
 
     REPO_ROOT=$(r=$(git rev-parse --git-dir) && r=$(cd "$r" && pwd)/ && cd "${r%%/.git/*}" && pwd)
-    PACKAGES=$(get-versions -p -c "${REPO_ROOT}/Packages/packages.cfg" -o "${CONTAINER_OS_NAME}" -t "${CONTAINER_OS_VERSION_ALT}")
+
+    if [[ "${CONTAINER_OS_NAME}" == "alpine" ]]; then
+        CONTAINER_SHELL="ash"
+    else
+        CONTAINER_SHELL="bash"
+    fi
+
+    PACKAGES=$(get-versions -p -c "${REPO_ROOT}/Packages/packages.cfg" -o "${CONTAINER_OS_NAME}" -t "${CONTAINER_OS_VERSION_ALT}" -s "${CONTAINER_SHELL}")
+    if [[ -f "Templates/static-packages.tpl" ]]; then
+        STATIC=$(<Templates/static-packages.tpl)
+        PACKAGES=$(printf "%s\n%s" "${PACKAGES}" "${STATIC}")
+    fi
 
     cp Dockerfile Dockerfile.bak
 
@@ -119,7 +130,6 @@ FROM ${CONTAINER_OS_NAME}:${CONTAINER_OS_VERSION_ALT}
 
 ${LINT}
 ${PACKAGES}
-		&& \\
 ${INSTALL}
 ${CLEANUP}