Merge pull request #3 from theohbrothers/refactor/ci-remove-need-for-dockerfile.header.ps1-and-dockerfile.footer.ps1-templates

Refactor (ci): Remove need for `Dockerfile.header.ps1` and `Dockerfile.footer.ps1` templates

Author: leojonathanoh

generate/definitions/VARIANTS.ps1

@@ -51,8 +51,6 @@ $VARIANTS_SHARED = @{
         templates = @{
             'Dockerfile' = @{
                 common = $true
-                includeHeader = $true
-                includeFooter = $true
                 passes = @(
                     @{
                         variables = @{}

generate/templates/Dockerfile.footer.ps1

@@ -1,6 +1,12 @@
 @"
-$(
-($VARIANT['_metadata']['components'] | % {
+FROM $( $VARIANT['_metadata']['distro'] ):$( $VARIANT['_metadata']['distro_version'] )
+
+RUN apk add --no-cache curl wget
+
+
+"@
+
+$VARIANT['_metadata']['components'] | % {
     $component = $_
 
     switch( $component ) {
@@ -25,6 +31,18 @@ RUN apk add --no-cache openssl
             throw "No such component: $component"
         }
     }
-}) -join ''
-)
+}
+
+@"
+# This is the only signal from the docker host that appears to stop crond
+STOPSIGNAL SIGKILL
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x /docker-entrypoint.sh
+
+VOLUME ["/cronscripts"]
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["crond", "-f"]
+
 "@

generate/templates/Dockerfile.header.ps1

@@ -6,8 +6,6 @@ RUN apk add --no-cache mysql-client
 
 RUN apk add --no-cache openssl
 
-
-
 # This is the only signal from the docker host that appears to stop crond
 STOPSIGNAL SIGKILL
 
@@ -17,4 +15,4 @@ RUN chmod +x /docker-entrypoint.sh
 VOLUME ["/cronscripts"]
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["crond", "-f"]
+CMD ["crond", "-f"]

generate/templates/Dockerfile.ps1

@@ -4,8 +4,6 @@ RUN apk add --no-cache curl wget
 
 RUN apk add --no-cache mysql-client
 
-
-
 # This is the only signal from the docker host that appears to stop crond
 STOPSIGNAL SIGKILL
 
@@ -15,4 +13,4 @@ RUN chmod +x /docker-entrypoint.sh
 VOLUME ["/cronscripts"]
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["crond", "-f"]
+CMD ["crond", "-f"]

variants/3.10-mysqlclient-openssl/Dockerfile

@@ -4,8 +4,6 @@ RUN apk add --no-cache curl wget
 
 RUN apk add --no-cache openssl
 
-
-
 # This is the only signal from the docker host that appears to stop crond
 STOPSIGNAL SIGKILL
 
@@ -15,4 +13,4 @@ RUN chmod +x /docker-entrypoint.sh
 VOLUME ["/cronscripts"]
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["crond", "-f"]
+CMD ["crond", "-f"]

variants/3.10-mysqlclient/Dockerfile

@@ -2,8 +2,6 @@ FROM alpine:3.10
 
 RUN apk add --no-cache curl wget
 
-
-
 # This is the only signal from the docker host that appears to stop crond
 STOPSIGNAL SIGKILL
 
@@ -13,4 +11,4 @@ RUN chmod +x /docker-entrypoint.sh
 VOLUME ["/cronscripts"]
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["crond", "-f"]
+CMD ["crond", "-f"]

variants/3.10-openssl/Dockerfile

@@ -6,8 +6,6 @@ RUN apk add --no-cache mysql-client
 
 RUN apk add --no-cache openssl
 
-
-
 # This is the only signal from the docker host that appears to stop crond
 STOPSIGNAL SIGKILL
 
@@ -17,4 +15,4 @@ RUN chmod +x /docker-entrypoint.sh
 VOLUME ["/cronscripts"]
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["crond", "-f"]
+CMD ["crond", "-f"]

variants/3.10/Dockerfile

@@ -4,8 +4,6 @@ RUN apk add --no-cache curl wget
 
 RUN apk add --no-cache mysql-client
 
-
-
 # This is the only signal from the docker host that appears to stop crond
 STOPSIGNAL SIGKILL
 
@@ -15,4 +13,4 @@ RUN chmod +x /docker-entrypoint.sh
 VOLUME ["/cronscripts"]
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["crond", "-f"]
+CMD ["crond", "-f"]