Merge pull request #3 from theohbrothers/refactor/generate-remove-doc…

…kerfile.header.ps1-and-dockerfile.footer.ps1-and-only-use-dockerfile.ps1 Refactor (generate): Remove Dockerfile.header.ps1 and Dockerfile.footer.ps1 and only use Dockerfile.ps1
theohbrothers · Sep 12, 2021 · 32720f1 · 32720f1
2 parents feba600 + 6786527
commit 32720f1
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 32 deletions.
diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1
@@ -50,8 +50,8 @@ $VARIANTS_SHARED = @{
         templates = @{
             'Dockerfile' = @{
                 common = $true
-                includeHeader = $true
-                includeFooter = $true
+                includeHeader = $false
+                includeFooter = $false
                 passes = @(
                     @{
                         variables = @{}

diff --git a/generate/templates/Dockerfile.footer.ps1 b/generate/templates/Dockerfile.footer.ps1
diff --git a/generate/templates/Dockerfile.header.ps1 b/generate/templates/Dockerfile.header.ps1
diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1
@@ -1,6 +1,10 @@
 @"
-$(
-($VARIANT['_metadata']['components'] | % {
+FROM $( $VARIANT['_metadata']['distro'] ):$( $VARIANT['_metadata']['distro_version'] )
+
+
+"@
+
+$VARIANT['_metadata']['components'] | % {
     $component = $_
 
     switch( $component ) {
@@ -58,6 +62,4 @@ RUN apk add --no-cache openssh
             throw "No such component: $component"
         }
     }
-}) -join ''
-)
-"@
+}
diff --git a/variants/3.10-curl-git-jq-ssh/Dockerfile b/variants/3.10-curl-git-jq-ssh/Dockerfile
@@ -8,5 +8,3 @@ RUN apk add --no-cache jq
 
 RUN apk add --no-cache openssh
 
-
-
diff --git a/variants/3.10-mysqlclient-openssl/Dockerfile b/variants/3.10-mysqlclient-openssl/Dockerfile
@@ -4,5 +4,3 @@ RUN apk add --no-cache mysql-client
 
 RUN apk add --no-cache openssl
 
-
-
diff --git a/variants/3.11-curl-git-jq-ssh/Dockerfile b/variants/3.11-curl-git-jq-ssh/Dockerfile
@@ -8,5 +8,3 @@ RUN apk add --no-cache jq
 
 RUN apk add --no-cache openssh
 
-
-
diff --git a/variants/3.11-mysqlclient-openssl/Dockerfile b/variants/3.11-mysqlclient-openssl/Dockerfile
@@ -4,5 +4,3 @@ RUN apk add --no-cache mysql-client
 
 RUN apk add --no-cache openssl
 
-
-
diff --git a/variants/3.12-curl-git-jq-ssh/Dockerfile b/variants/3.12-curl-git-jq-ssh/Dockerfile
@@ -8,5 +8,3 @@ RUN apk add --no-cache jq
 
 RUN apk add --no-cache openssh
 
-
-
diff --git a/variants/3.12-mysqlclient-openssl/Dockerfile b/variants/3.12-mysqlclient-openssl/Dockerfile
@@ -4,5 +4,3 @@ RUN apk add --no-cache mysql-client
 
 RUN apk add --no-cache openssl
 
-
-
diff --git a/variants/3.8-curl-git-jq-ssh/Dockerfile b/variants/3.8-curl-git-jq-ssh/Dockerfile
@@ -8,5 +8,3 @@ RUN apk add --no-cache jq
 
 RUN apk add --no-cache openssh
 
-
-
diff --git a/variants/3.8-mysqlclient-openssl/Dockerfile b/variants/3.8-mysqlclient-openssl/Dockerfile
@@ -4,5 +4,3 @@ RUN apk add --no-cache mysql-client
 
 RUN apk add --no-cache openssl
 
-
-
diff --git a/variants/3.9-curl-git-jq-ssh/Dockerfile b/variants/3.9-curl-git-jq-ssh/Dockerfile
@@ -8,5 +8,3 @@ RUN apk add --no-cache jq
 
 RUN apk add --no-cache openssh
 
-
-
diff --git a/variants/3.9-mysqlclient-openssl/Dockerfile b/variants/3.9-mysqlclient-openssl/Dockerfile
@@ -4,5 +4,3 @@ RUN apk add --no-cache mysql-client
 
 RUN apk add --no-cache openssl
 
-
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,5 +8,3 @@ RUN apk add --no-cache jq

		RUN apk add --no-cache openssh
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,5 +4,3 @@ RUN apk add --no-cache mysql-client

		RUN apk add --no-cache openssl