Extract ASDF_HOME

2 files changed, 23 insertions, 12 deletions

diff --git a/Dockerfile b/Dockerfile
index a1cc4a6..fe3044c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,18 +11,16 @@ RUN apt-get update -q \
   && apt-get install -y --no-install-recommends ruby \
   && gem build *.gemspec
 
-FROM debian:stable-slim
-ENV LM_HOME=/opt/license-management
-ENV PATH="${PATH}:/root/.asdf/shims:/root/.asdf/bin"
+FROM debian:stable-slim AS tool-builder
+ENV ASDF_HOME="/root/.asdf"
+ENV PATH="${PATH}:${ASDF_HOME}/shims:${ASDF_HOME}/bin"
 ENV TERM="xterm"
 ENV HOME=/root
 WORKDIR $HOME
 COPY config /root
-COPY --from=gem-builder /opt/license-management/*.gem $LM_HOME/
-COPY test /test
-COPY run.sh /
-RUN mv /root/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc && \
-  apt-get update -q && apt-get install -y --no-install-recommends \
+RUN mv /root/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc \
+  && apt-get update -q \
+  && apt-get install -y --no-install-recommends \
   apt-transport-https \
   apt-utils \
   autoconf \
@@ -74,7 +72,7 @@ RUN mv /root/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc && \
   && wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/microsoft.asc.gpg \
   && wget -q -O /etc/apt/sources.list.d/microsoft-prod.list https://packages.microsoft.com/config/debian/10/prod.list \
   && apt-get update -q && apt-get install -y --no-install-recommends dotnet-sdk-3.1 \
-  && git clone --depth 1 https://github.com/asdf-vm/asdf.git $HOME/.asdf \
+  && git clone --depth 1 https://github.com/asdf-vm/asdf.git $ASDF_HOME \
   && asdf plugin-add golang \
   && asdf plugin-add java \
   && asdf plugin-add maven \
@@ -82,11 +80,24 @@ RUN mv /root/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc && \
   && asdf plugin-add php \
   && asdf plugin-add python \
   && asdf plugin-add ruby \
-  && bash $HOME/.asdf/plugins/nodejs/bin/import-release-team-keyring \
-  && asdf install \
+  && bash $ASDF_HOME/plugins/nodejs/bin/import-release-team-keyring
+RUN asdf install \
   && asdf reshim \
   && asdf current \
   && rm -fr /tmp \
   && mkdir -p /tmp \
   && bash -lc 'scrub'
+
+FROM debian:stable-slim
+ENV LM_HOME=/opt/license-management
+ENV ASDF_HOME="/root/.asdf"
+ENV PATH="${PATH}:${ASDF_HOME}/shims:${ASDF_HOME}/bin"
+ENV TERM="xterm"
+ENV HOME=/root
+WORKDIR $HOME
+COPY config /root
+COPY --from=tool-builder /root/.asdf $ASDF_HOME/
+COPY --from=gem-builder /opt/license-management/*.gem $LM_HOME/
+COPY test /test
+COPY run.sh /
 ENTRYPOINT ["/run.sh"]
diff --git a/bin/lint b/bin/lint
index 38f4e10..58bdaeb 100755
--- a/bin/lint
+++ b/bin/lint
@@ -2,4 +2,4 @@
 
 shellcheck config/.bashrc
 shellcheck config/.profile
-shellcheck run.sh
+# shellcheck run.sh