From 46159fd1908e9980eb4660fa70f2886731cbed43 Mon Sep 17 00:00:00 2001
From: Aleksey Karpov <86011874+alekseyolg@users.noreply.github.com>
Date: Thu, 29 Jun 2023 22:03:59 +0300
Subject: [PATCH] build(docker): add dockerize image (#24534)

Co-authored-by: Aleksey Karpov <al.karpov@okko.tv>
---
 .github/workflows/docker_build_push.sh | 11 +++++++++++
 dockerize.Dockerfile                   | 13 +++++++++++++
 helm/superset/Chart.yaml               |  2 +-
 helm/superset/README.md                |  6 +++---
 helm/superset/values.yaml              |  4 ++--
 5 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 dockerize.Dockerfile

diff --git a/.github/workflows/docker_build_push.sh b/.github/workflows/docker_build_push.sh
index 3ee615bc014c7..1a7575dc2c279 100755
--- a/.github/workflows/docker_build_push.sh
+++ b/.github/workflows/docker_build_push.sh
@@ -96,6 +96,17 @@ DOCKER_BUILDKIT=1 docker build --target dev \
   --label "build_actor=${GITHUB_ACTOR}" \
   .
 
+#
+# Build the dockerize image
+#
+DOCKER_BUILDKIT=1 docker build \
+  -t "${REPO_NAME}:dockerize" \
+  --label "sha=${SHA}" \
+  --label "built_at=$(date)" \
+  --label "build_actor=${GITHUB_ACTOR}" \
+  -f dockerize.Dockerfile \
+  .
+
 if [ -z "${DOCKERHUB_TOKEN}" ]; then
   # Skip if secrets aren't populated -- they're only visible for actions running in the repo (not on forks)
   echo "Skipping Docker push"
diff --git a/dockerize.Dockerfile b/dockerize.Dockerfile
new file mode 100644
index 0000000000000..4a3fa1b6f25dd
--- /dev/null
+++ b/dockerize.Dockerfile
@@ -0,0 +1,13 @@
+FROM alpine:latest
+
+ARG DOCKERIZE_VERSION=v0.7.0
+
+RUN apk update --no-cache \
+    && apk add --no-cache wget openssl \
+    && wget -O - https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz | tar xzf - -C /usr/local/bin \
+    && apk del wget
+
+USER 10001
+
+ENTRYPOINT ["dockerize"]
+CMD ["--help"]
diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
index 4f0f6d7305f10..7a700075fc7ab 100644
--- a/helm/superset/Chart.yaml
+++ b/helm/superset/Chart.yaml
@@ -29,7 +29,7 @@ maintainers:
   - name: craig-rueda
     email: craig@craigrueda.com
     url: https://github.com/craig-rueda
-version: 0.10.2
+version: 0.10.3
 dependencies:
   - name: postgresql
     version: 12.1.6
diff --git a/helm/superset/README.md b/helm/superset/README.md
index dc58b30f78c4f..e75c65dc2827b 100644
--- a/helm/superset/README.md
+++ b/helm/superset/README.md
@@ -23,7 +23,7 @@ NOTE: This file is generated by helm-docs: https://github.com/norwoodj/helm-docs
 
 # superset
 
-![Version: 0.10.2](https://img.shields.io/badge/Version-0.10.2-informational?style=flat-square)
+![Version: 0.10.3](https://img.shields.io/badge/Version-0.10.3-informational?style=flat-square)
 
 Apache Superset is a modern, enterprise-ready business intelligence web application
 
@@ -102,8 +102,8 @@ helm install my-superset superset/superset
 | init.tolerations | list | `[]` |  |
 | init.topologySpreadConstraints | list | `[]` | TopologySpreadConstrains to be added to init job |
 | initImage.pullPolicy | string | `"IfNotPresent"` |  |
-| initImage.repository | string | `"jwilder/dockerize"` |  |
-| initImage.tag | string | `"latest"` |  |
+| initImage.repository | string | `"apache/superset"` |  |
+| initImage.tag | string | `"dockerize"` |  |
 | nameOverride | string | `nil` | Provide a name to override the name of the chart |
 | nodeSelector | object | `{}` |  |
 | postgresql | object | see `values.yaml` | Configuration values for the postgresql dependency. ref: https://github.com/kubernetes/charts/blob/master/stable/postgresql/README.md |
diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml
index d8336e78d1d47..fa2180aa607b4 100644
--- a/helm/superset/values.yaml
+++ b/helm/superset/values.yaml
@@ -183,8 +183,8 @@ image:
 imagePullSecrets: []
 
 initImage:
-  repository: jwilder/dockerize
-  tag: latest
+  repository: apache/superset
+  tag: dockerize
   pullPolicy: IfNotPresent
 
 service: