From 42cc19efddbdf0bc1e798b359216042de101bd69 Mon Sep 17 00:00:00 2001
From: Michele <mdeggies@gmail.com>
Date: Sun, 6 Dec 2020 22:22:57 -0800
Subject: [PATCH] Use releases.hashicorp.com as source of truth

---
 Dockerfile    | 13 +++++++------
 download.json | 12 ++++++++++++
 download.yaml |  3 ---
 renovate.json |  4 ++--
 4 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 download.json
 delete mode 100644 download.yaml

diff --git a/Dockerfile b/Dockerfile
index 4623a8d..06f11cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,21 +2,22 @@ ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io
 ARG BASE_IMAGE=ubi8
 ARG BASE_TAG=8.2
 
-FROM vault:1.6.0 AS source
-
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-LABEL org.opencontainers.image.title="vault" \
+LABEL org.opencontainers.image.title="hashicorp/vault" \
       org.opencontainers.image.description="Vault is a tool for securely accessing secrets." \
       org.opencontainers.image.licenses="MPL-2.0" \
       org.opencontainers.image.url="https://www.vaultproject.io/" \
       org.opencontainers.image.version="1.6.0" \
-      maintainer="cht@dsop.io"
+      maintainer="rel-eng@hashicorp.com"
 
-COPY --from=source /bin/vault /bin/vault
+COPY vault.zip /tmp
 COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 
-RUN groupadd -g 1001 vault && \
+RUN unzip -d /bin /tmp/vault.zip && \
+    chmod +x /bin/vault && \
+    rm /tmp/vault.zip && \
+    groupadd -g 1001 vault && \
     useradd -r -u 1001 -m -s /sbin/nologin -g vault vault && \
     mkdir -p /vault/logs && \
     mkdir -p /vault/file && \
diff --git a/download.json b/download.json
new file mode 100644
index 0000000..318afe0
--- /dev/null
+++ b/download.json
@@ -0,0 +1,12 @@
+{
+  "resources": [
+      {
+          "url": "https://releases.hashicorp.com/vault/1.6.0/vault_1.6.0_linux_amd64.zip",
+          "filename": "vault.zip",
+          "validation": {
+              "type": "sha256",
+              "value": "83048e2d1ebfea212fead42e474e947c3a3bccc5056a5158ed33f530f8325e39"
+          }
+      }
+  ]
+}
\ No newline at end of file
diff --git a/download.yaml b/download.yaml
deleted file mode 100644
index c172157..0000000
--- a/download.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resources:
-  - url: "docker://docker.io/library/vault@sha256:b04266db3e7ece92690df720fcf98ecf138a92ed3d1edc14dc86fe814c33ab9b"
-    tag: "vault:1.6.0"
diff --git a/renovate.json b/renovate.json
index 102a928..99950ea 100644
--- a/renovate.json
+++ b/renovate.json
@@ -7,7 +7,7 @@
       "matchStrings": [
         "version=\"(?<currentValue>.*?)\""
       ],
-      "depNameTemplate": "vault",
+      "depNameTemplate": "hashicorp/vault",
       "datasourceTemplate": "docker"
     },
     {
@@ -15,7 +15,7 @@
       "matchStrings": [
         "version:\\s+\"(?<currentValue>.*?)\""
       ],
-      "depNameTemplate": "vault",
+      "depNameTemplate": "hashicorp/vault",
       "datasourceTemplate": "docker"
     }
   ]
-- 
GitLab