From 436647251cd7b3a6e949e5bedb0542b604c1ce76 Mon Sep 17 00:00:00 2001 From: zeus Date: Thu, 23 Dec 2021 14:46:59 +0200 Subject: [PATCH] add --- install/usr/share/swarmlab.io/sec/swarmlab-sec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/install/usr/share/swarmlab.io/sec/swarmlab-sec b/install/usr/share/swarmlab.io/sec/swarmlab-sec index dd43d56..eb2e6d8 100755 --- a/install/usr/share/swarmlab.io/sec/swarmlab-sec +++ b/install/usr/share/swarmlab.io/sec/swarmlab-sec @@ -139,10 +139,9 @@ if [ -d "$Wdir/project" ]; then echo "" echo ">>> Load Origin " cat << EOF > $Wdir/Dockerfile - FROM $IMAGE_origin + FROM $IMAGE_origin AS builder # -ARG DEF_ALPINE_VERSION=3.11 -FROM alpine:\${DEF_ALPINE_VERSION} AS builder +ARG DEF_ALPINE_VERSION=$IMAGE_origin ARG DEF_USERNAME=root USER \${DEF_USERNAME} WORKDIR /tmp/build/ @@ -154,7 +153,7 @@ RUN curl -fL https://downloads.volatilityfoundation.org/volatility3/symbols/wind RUN apk --purge del \ .build -FROM alpine:\${DEF_ALPINE_VERSION} +FROM \${DEF_ALPINE_VERSION} ARG DEF_USERNAME=root ARG DEF_INSTALL_PREFIX=/usr @@ -302,10 +301,9 @@ if [ "$Wdir" == "$HOME" ]; then then echo ">>> Load Origin " cat << EOF > $Wdir/Dockerfile - FROM $IMAGE_origin + FROM $IMAGE_origin AS builder # -ARG DEF_ALPINE_VERSION=3.11 -FROM alpine:\${DEF_ALPINE_VERSION} AS builder +ARG DEF_ALPINE_VERSION=$IMAGE_origin ARG DEF_USERNAME=root USER \${DEF_USERNAME} WORKDIR /tmp/build/ @@ -317,7 +315,8 @@ RUN curl -fL https://downloads.volatilityfoundation.org/volatility3/symbols/wind RUN apk --purge del \ .build -FROM alpine:\${DEF_ALPINE_VERSION} +FROM \${DEF_ALPINE_VERSION} + ARG DEF_USERNAME=root ARG DEF_INSTALL_PREFIX=/usr