Add the ability to save Dockerfile during building.

Author: moigagoo

.gitignore

@@ -2,5 +2,5 @@ build
 *.exe
 nimcache
 *.sublime-*
-Dockerfile
+./Dockerfile
 bin/

Dockerfiles/2.2.2/regular/Dockerfile

@@ -0,0 +1,13 @@
+FROM nimlang/nim:2.2.2-alpine-slim
+LABEL authors="Konstantin Molchanov <[email protected]>, \
+                 Guilherme Thomazi Bonicontro <[email protected]>, \
+                 Dominik Picheta <http://picheta.me>, \
+                 nigredo-tori <https://github.com/nigredo-tori>, \
+                 markprocess <https://github.com/markprocess>, \
+                 theAkito <[email protected]>"
+RUN apk add --no-cache git mercurial openssl
+RUN cd nim; nim c koch; ./koch tools;\
+    ln -s `pwd`/bin/nimble /bin/nimble;\
+    ln -s `pwd`/bin/nimsuggest /bin/nimsuggest;\
+    ln -s `pwd`/bin/testament /bin/testament
+ENV PATH="/root/.nimble/bin:$PATH"

Dockerfiles/2.2.2/slim/Dockerfile

@@ -0,0 +1,14 @@
+FROM alpine:3.20
+LABEL authors="Konstantin Molchanov <[email protected]>, \
+                 Guilherme Thomazi Bonicontro <[email protected]>, \
+                 Dominik Picheta <http://picheta.me>, \
+                 nigredo-tori <https://github.com/nigredo-tori>, \
+                 markprocess <https://github.com/markprocess>, \
+                 theAkito <[email protected]>"
+RUN apk add --no-cache g++ curl tar xz nodejs
+RUN mkdir -p /nim; \
+    curl -sL "https://nim-lang.org/download/nim-2.2.2.tar.xz" \
+    |tar xJ --strip-components=1 -C /nim; \
+    cd /nim; sh build.sh; \
+    rm -r c_code tests; \
+    ln -s `pwd`/bin/nim /bin/nim

nimage.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "1.0.0"
+version       = "1.0.1"
 author        = "Constantine Molchanov"
 description   = "Build and push Nim Docker images to Docker Hub."
 license       = "MIT"

src/nimage.nim

@@ -4,7 +4,6 @@ import climate
 
 import nimage/flavors/[slim, regular]
 
-
 proc isDefault(props: JsonNode): bool =
   props.getOrDefault("default").getBool
 
@@ -44,7 +43,7 @@ proc getTags(
     result.add flavor
 
 proc generateDockerfile(
-    version, base, flavor: string, labels: openarray[(string, string)]
+    version, base, flavor: string, labels: openarray[(string, string)], dockerfileDir: string
 ) =
   var content = ""
 
@@ -68,18 +67,20 @@ proc generateDockerfile(
   else:
     discard
 
-  writeFile("Dockerfile", content)
+  createDir(dockerfileDir)
+
+  writeFile(dockerfileDir / "Dockerfile", content)
 
-proc buildAndPushImage(tags: openarray[string], tagPrefix: string) =
+proc buildAndPushImage(tags: openarray[string], tagPrefix: string, dockerfileDir: string) =
   const dockerBuildCommand =
-    "docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm $# ."
+    "docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm $# $#"
 
   var tagLine = ""
 
   for tag in tags:
     tagLine &= " -t $#:$# " % [tagPrefix, tag]
 
-  discard execShellCmd dockerBuildCommand % tagLine
+  discard execShellCmd dockerBuildCommand % [tagLine, dockerfileDir]
 
 proc testImage(image: string, flavor: string) =
   let succeeded =
@@ -105,12 +106,16 @@ proc showHelp(context: Context): int =
 
 Usage:
 
-  $ nimage build-and-push [--config|-c=config.json] [--all|-a] [--dry|-d] [<version> <version> ...]
+  $ nimage build-and-push [--config|-c=config.json] [--all|-a] [--dry|-d] [--save|-s] [<version> <version> ...]
 
 Build and push specific versions:
 
   $ nimage build-and-push <version1> <version2> ...
 
+Build and push specific versions and save the Dockerfiles in `Dockerfiles/<version>/<flavor>`:
+
+  $ nimage build-and-push --save <version1> <version2> ...
+
 Build and push all versions listed in the config file:
 
   $ nimage build-and-push --all
@@ -121,7 +126,7 @@ Use custom config file (by default, `config.json` in the current directory is us
 
 Dry run (nothing is built or pushed, use to check the config and command args):
 
-  $ nimage build-and-push --dry search_shortcut: ALT+SHIFT+SPACEsearch_shortcut: ALT+SHIFT+SPACE<version1> <version2> ...
+  $ nimage build-and-push --dry <version1> <version2> ...
 """
 
   echo helpMessage
@@ -143,11 +148,13 @@ proc buildAndPushImages(context: Context): int =
     labels = {"authors": authors}
     tagPrefix = "nimlang/nim"
     flavors = ["slim", "regular"]
+    dockerfilesDir = "Dockerfiles"
 
   var
     configFile = "config.json"
     buildAll = false
     dryRun = false
+    save = false
     targets: seq[string] = @[]
 
   context.opt("config", "c"):
@@ -159,6 +166,9 @@ proc buildAndPushImages(context: Context): int =
   context.flag("dry", "d"):
     dryRun = true
 
+  context.flag("save", "s"):
+    save = true
+
   context.args:
     targets = args
 
@@ -171,26 +181,34 @@ proc buildAndPushImages(context: Context): int =
     if buildAll or version.key in targets:
       for base in bases.pairs:
         for flavor in flavors:
-          let tags = getTags(version, base, flavor)
+          let
+            dockerfileDir = dockerfilesDir / version.key / flavor 
+            tags = getTags(version, base, flavor)
+
+          echo "Building and pushing $# from $#... " % [tags[0], dockerfileDir]
 
-          echo "Building and pushing $#... " % tags[0]
           if not dryRun:
-            generateDockerfile(version.key, base.key, flavor, labels)
-            buildAndPushImage(tags, tagPrefix)
-            removeFile("Dockerfile")
+            generateDockerfile(version.key, base.key, flavor, labels, dockerfileDir)
+
+            buildAndPushImage(tags, tagPrefix, dockerfileDir)
+
+            if save:
+              echo "Saving Dockerfile to $#..." % dockerfileDir
+            else:
+              removeDir(dockerfileDir)
+
           echo "Done!"
 
           # Anything before this is broken and too old to fix.
           if version.key >= "0.16.0":
             echo "Testing $#... " % tags[0]
+
             if not dryRun:
               testImage("$#:$#" % [tagPrefix, tags[0]], flavor)
-            echo "Done!"
 
+            echo "Done!"
 
 const commands = {"build-and-push": buildAndPushImages, "setup": createBuilder}
 
-
 when isMainModule:
   quit parseCommands(commands, defaultHandler = showHelp)
-