Merge branch 'master' into helm

Author: ccleouf66

cmd/download.go

@@ -30,31 +30,51 @@ func DownloadCommand() cli.Command {
 		},
 		cli.StringSliceFlag{
 			Name:  "image",
-			Usage: "Download an imgae list.\n rkd download --image busybox --image alpine",
+			Usage: "Download an image list.\n rkd download --image busybox --image alpine",
 		},
 		cli.StringFlag{
 			Name:  "rancher",
 			Usage: "Download Rancher images, rke and helm chart.\n rkd download --rancher v2.5.0",
 		},
+		cli.StringFlag{
+			Name:  "dest",
+			Usage: "Set the name of the destination folder containing all downloaded componets (images, rancher images, rancher chart, ...), optional, a generic name will be set: datapack-YYY_MM_JJThh_mm_ss\n rkd download --rancher v2.5.0 --dest destFolder",
+		},
+		cli.StringFlag{
+			Name:  "imgarchname",
+			Usage: "Set the name of the generated archive containing additionals images provided by --image flag, optional, default archive name is images.tar\n rkd download --rancher v2.5.0 --image busybox --imgarchname busybox.tar",
+		},
 	}
 
 	return cli.Command{
 		Name:    "download",
 		Aliases: []string{"d"},
-		Usage:   "Downlaod helm chart list, container images and Rancher release",
+		Usage:   "Download helm chart list, container images and Rancher release",
 		Action:  DownloadDataPack,
 		Flags:   DownloadFlags,
 	}
 }
 
-// DownloadRancherRelease downlaod Rancher chart and images
+// DownloadDataPack downlaod Rancher chart and images
 func DownloadDataPack(c *cli.Context) {
 
-	dest := helpers.GenFileName("datapack")
+	var dest string
+
+	if c.String("dest") != "" {
+		dest = c.String("dest")
+	} else {
+		dest = helpers.GenFileName("datapack")
+	}
 	helpers.CreateDestDir(dest)
 
 	if len(c.StringSlice("image")) > 0 {
-		destImg := fmt.Sprintf("%s/images.tar", dest)
+		var destImg string
+
+		if c.String("imgarchname") != "" {
+			destImg = fmt.Sprintf("%s/%s", dest, c.String("imgarchname"))
+		} else {
+			destImg = fmt.Sprintf("%s/images.tar", dest)
+		}
 		containers.DownloadImage(c.StringSlice("image"), destImg)
 	}
 

dockerfile

@@ -0,0 +1,31 @@
+FROM ubuntu:20.04 AS builder
+
+ENV ENV="/root/.bashrc" \
+    TZ=Europe \
+    EDITOR=vi \
+    LANG=en_US.UTF-8
+
+WORKDIR /go/src/rkd
+
+COPY . /go/src/rkd/
+
+ADD https://golang.org/dl/go1.15.2.linux-amd64.tar.gz /tmp
+
+RUN    ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
+       apt-get update && \
+       apt-get install -y sudo git build-essential make libdevmapper-dev libgpgme-dev libostree-dev curl libassuan-dev libbtrfs-dev && \
+       tar -C /usr/local -xzf /tmp/go1.15.2.linux-amd64.tar.gz && \
+       rm /tmp/go1.15.2.linux-amd64.tar.gz && \
+       ln -s /usr/local/go/bin/* /usr/local/bin/ && \
+       go get && \
+       GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o /go/src/rkd/rkd-linux-amd64
+
+FROM debian:stretch-slim
+WORKDIR /go/bin/
+COPY --from='builder' /go/src/rkd/rkd-linux-amd64 /go/bin/rkd-linux-amd64
+COPY --from='builder' /go/src/rkd/policy.json /go/bin/
+COPY --from='builder' /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+run apt update && \
+    apt install -y libgpgme-dev libdevmapper-dev && \
+    rm -rf /var/lib/apt/lists/*
+ENTRYPOINT ["/go/bin/rkd-linux-amd64"]

readme.md

@@ -21,23 +21,28 @@ Num. Name - TagName
 ```
 
 ## Download latest package
-To downlaod the package in order install a Rancher on Air Gapped environment (helm chart + images):
+To download the package in order install a Rancher on Air Gapped environment (helm chart + images):
 
 ```bash
-# Downlaod latest chart & images of rancher
-./rkd downlaod
+# download latest chart & images of rancher
+./rkd download
 ```
 
 ```bash
-# Downlaod only busybox and alpine images
-./rkd downlaod --image busybox --image alpine
+# download only busybox and alpine images
+./rkd download --image busybox --image alpine
 ```
 
 ```bash
-# Downlaod rancher v2.5.0 and alpine image
+# download rancher v2.5.0 and alpine image
 ./rkd d --rancher v2.4.8 --image alpine
 ```
 
+```bash
+# download only busybox and alpine images in the specified directory
+./rkd download --image busybox --image alpine --dest myDirectory
+```
+
 ## Auth
 rkd uses Docker credential helpers to pull images from a registry.