From 94557344b7118b888edf6825abd5e33035e786d4 Mon Sep 17 00:00:00 2001
From: Maidul Islam <maidul98@gmail.com>
Date: Tue, 2 Jan 2024 13:43:39 -0500
Subject: [PATCH] wrap cli into a docker image

---
 .goreleaser.yaml      | 56 ++++++++++++++++++++++---------------------
 cli/docker/Dockerfile |  4 ----
 cli/docker/alpine     |  9 +++++++
 3 files changed, 38 insertions(+), 31 deletions(-)
 delete mode 100644 cli/docker/Dockerfile
 create mode 100644 cli/docker/alpine

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 50115e58f..fa63b035a 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -16,23 +16,23 @@ monorepo:
   dir: cli
 
 builds:
-  - id: darwin-build
-    binary: infisical
-    ldflags:
-      - -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Version }}
-      - -X github.com/Infisical/infisical-merge/packages/telemetry.POSTHOG_API_KEY_FOR_CLI={{ .Env.POSTHOG_API_KEY_FOR_CLI }}
-    flags:
-      - -trimpath
-    env:
-      - CGO_ENABLED=1
-      - CC=/home/runner/work/osxcross/target/bin/o64-clang
-      - CXX=/home/runner/work/osxcross/target/bin/o64-clang++
-    goos:
-      - darwin
-    ignore:
-      - goos: darwin
-        goarch: "386"
-    dir: ./cli
+  # - id: darwin-build
+  #   binary: infisical
+  #   ldflags:
+  #     - -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Version }}
+  #     - -X github.com/Infisical/infisical-merge/packages/telemetry.POSTHOG_API_KEY_FOR_CLI={{ .Env.POSTHOG_API_KEY_FOR_CLI }}
+  #   flags:
+  #     - -trimpath
+  #   env:
+  #     - CGO_ENABLED=1
+  #     - CC=/home/runner/work/osxcross/target/bin/o64-clang
+  #     - CXX=/home/runner/work/osxcross/target/bin/o64-clang++
+  #   goos:
+  #     - darwin
+  #   ignore:
+  #     - goos: darwin
+  #       goarch: "386"
+  #   dir: ./cli
 
   - id: all-other-builds
     env:
@@ -108,7 +108,7 @@ brews:
       zsh_completion.install "completions/infisical.zsh" => "_infisical"
       fish_completion.install "completions/infisical.fish"
       man1.install "manpages/infisical.1.gz"
-  - name: 'infisical@{{.Version}}'
+  - name: "infisical@{{.Version}}"
     tap:
       owner: Infisical
       name: homebrew-get-cli
@@ -186,12 +186,14 @@ aurs:
       # man pages
       install -Dm644 "./manpages/infisical.1.gz" "${pkgdir}/usr/share/man/man1/infisical.1.gz"
 
-# dockers:
-#   - dockerfile: cli/docker/Dockerfile
-#     goos: linux
-#     goarch: amd64
-#     ids:
-#       - infisical
-#     image_templates:
-#       - "infisical/cli:{{ .Version }}"
-#       - "infisical/cli:latest"
+dockers:
+  - dockerfile: docker/alpine
+    goos: linux
+    goarch: amd64
+    ids:
+      - all-other-builds
+    image_templates:
+      - "infisical/cli:{{ .Version }}"
+      - "infisical/cli:{{ .Major }}.{{ .Minor }}"
+      - "infisical/cli:{{ .Major }}"
+      - "infisical/cli:latest"
diff --git a/cli/docker/Dockerfile b/cli/docker/Dockerfile
deleted file mode 100644
index 0436d4d8e..000000000
--- a/cli/docker/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM alpine
-RUN apk add --no-cache tini
-COPY infisical /bin/infisical
-ENTRYPOINT ["/sbin/tini", "--", "/bin/infisical"]
\ No newline at end of file
diff --git a/cli/docker/alpine b/cli/docker/alpine
new file mode 100644
index 000000000..ddc173ee5
--- /dev/null
+++ b/cli/docker/alpine
@@ -0,0 +1,9 @@
+FROM alpine
+RUN apk add --no-cache tini
+
+## Upgrade OpenSSL libraries to mitigate known vulnerabilities as the current Alpine image has not been patched yet.
+RUN apk update && apk upgrade --no-cache libcrypto3 libssl3
+
+
+COPY infisical /infisical
+ENTRYPOINT ["/sbin/tini", "--", "/infisical"]
\ No newline at end of file