From 85bb53605278da46586d8b824e424e8f01c5afbb Mon Sep 17 00:00:00 2001
From: fix <sf@psychophoniac.de>
Date: Thu, 11 Mar 2021 12:42:06 +0100
Subject: [PATCH] init

---
 Dockerfile | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6479c59..275a038 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,14 +4,17 @@ FROM golang:${GO_VERSION} as build
 
 ARG NODE_10_SRC="http://dl-cdn.alpinelinux.org/alpine/v3.10/main/x86_64"
 
+#	NPM_APK=$(wget -qO- "${NODE_10_SRC}" | gawk 'match($0,/^.*href="(npm-10\..*\.apk)".*$/,ary) { print ary[1] }') && \
+#	wget -O nodejs10.apk "${NODE_10_SRC}/${NODE_APK}" && \
+#	wget -O npm10.apk "${NODE_10_SRC}/${NODE_APK}" && \
+#	apk add nodejs10.apk npm10.apk
+
 RUN \
 	apk update --no-cache && \
 	apk add --no-cache gawk && \
 	NODE_APK=$(wget -qO- "${NODE_10_SRC}" | gawk 'match($0,/^.*href="(nodejs-10\..*\.apk)".*$/,ary) { print ary[1] }') && \
-	NPM_APK=$(wget -qO- "${NODE_10_SRC}" | gawk 'match($0,/^.*href="(npm-10\..*\.apk)".*$/,ary) { print ary[1] }') && \
 	wget -O nodejs10.apk "${NODE_10_SRC}/${NODE_APK}" && \
-	wget -O npm10.apk "${NODE_10_SRC}/${NODE_APK}" && \
-	apk add nodejs10.apk npm10.apk
+	apk add nodejs10.apk 
 
 RUN \
 	apk update --no-cache &&\
@@ -19,6 +22,7 @@ RUN \
 		bash \
 		git \
 		make \
+		npm \
 		yarn && \
 	git config --global advice.detachedHead false
 
@@ -26,7 +30,7 @@ ARG VAULT_VERSION=
 ARG VAULT_REPO
 ARG BUILD_PATH=vault
 
-RUN \
+RUN --mount=type=tmpfs,target=/go/src/ \
 	echo "selected repo: ${VAULT_REPO}" && \
 	if [ -z "${VAULT_VERSION}" ]; then \
 		VAULT_VERSION=$( \
@@ -43,7 +47,8 @@ RUN \
 		"${VAULT_REPO}" \
 		"${BUILD_PATH}" && \
 	cd "${BUILD_PATH}" && \
-	make static-dist dev-ui
+	make static-dist dev-ui && \
+	cp /go/bin/vault /vault
 
 FROM alpine:3 as runtime
 
@@ -54,9 +59,9 @@ RUN \
 	mkdir -p \
 		/vault/file \
 		/vault/config && \
-	chown -R vault:vault
+	chown -R vault:vault /vault
 
-COPY --from=build /go/bin/vault /bin/vault
+COPY --from=build /vault /bin/vault
 
 ENTRYPOINT /bin/vault server -config /vault/config