Use ASDF_DATA_DIR

2 files changed, 19 insertions, 31 deletions

diff --git a/Dockerfile b/Dockerfile
index 47f0f93..ebac880 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,12 +12,13 @@ RUN apt-get update -q \
   && gem build *.gemspec
 
 FROM debian:stable-slim AS asdf-builder
-ENV ASDF_HOME="/opt/asdf"
-ENV PATH="${PATH}:${ASDF_HOME}/shims:${ASDF_HOME}/bin"
+ENV ASDF_DATA_DIR="/opt/asdf"
+ENV PATH="${PATH}:${ASDF_DATA_DIR}/shims:${ASDF_DATA_DIR}/bin"
 ENV TERM="xterm"
 ENV HOME=/root
 WORKDIR $HOME
 COPY config /root
+COPY config/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
 ENV PACKAGES apt-transport-https \
   apt-utils \
   autoconf \
@@ -56,6 +57,7 @@ ENV PACKAGES apt-transport-https \
   libyaml-dev \
   libzip-dev \
   locate \
+  mono-devel \
   openssl \
   pkg-config \
   re2c \
@@ -65,13 +67,13 @@ ENV PACKAGES apt-transport-https \
   wget \
   zlib1g \
   zlib1g-dev
-RUN mv /root/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc \
-  && apt-get update -q \
+RUN apt-get update -q \
   && apt-get install -y --no-install-recommends $PACKAGES \
   && 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 $ASDF_HOME \
+  && mkdir -p "$ASDF_DATA_DIR" \
+  && git clone --depth 1 https://github.com/asdf-vm/asdf.git "$ASDF_DATA_DIR" \
   && asdf plugin-add golang \
   && asdf plugin-add java \
   && asdf plugin-add maven \
@@ -79,31 +81,17 @@ 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 $ASDF_HOME/plugins/nodejs/bin/import-release-team-keyring
-COPY --from=gem-builder /opt/license-management/*.gem $LM_HOME/
-RUN asdf install \
+  && bash $ASDF_DATA_DIR/plugins/nodejs/bin/import-release-team-keyring \
+  && 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="/opt/asdf"
-ENV PATH="${PATH}:${ASDF_HOME}/shims:${ASDF_HOME}/bin"
-ENV TERM="xterm"
-ENV HOME=/root
-ENV PACKAGES wget mono-devel
-WORKDIR $HOME
-COPY config /root
-RUN mv /root/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc \
-  && apt-get update -q \
-  && apt-get install -y --no-install-recommends $PACKAGES \
-  && 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
-COPY --from=asdf-builder /opt/asdf $ASDF_HOME/
+FROM asdf-builder
+COPY --from=gem-builder /opt/license-management/*.gem $LM_HOME/
+RUN bash -lc 'gem install "$LM_HOME/*.gem"'
 COPY test /test
 COPY run.sh /
 ENTRYPOINT ["/run.sh"]
diff --git a/config/.bashrc b/config/.bashrc
index eff628f..bfa2b40 100644
--- a/config/.bashrc
+++ b/config/.bashrc
@@ -14,9 +14,9 @@ export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
 export RUBY_HEAP_SLOTS_INCREMENT=400000
 
 # shellcheck source=/dev/null
-. "$ASDF_HOME/asdf.sh"
+. "$ASDF_DATA_DIR/asdf.sh"
 # shellcheck source=/dev/null
-. "$ASDF_HOME/completions/asdf.bash"
+. "$ASDF_DATA_DIR/completions/asdf.bash"
 
 function switch_to() {
   tool=$1
@@ -26,10 +26,10 @@ function switch_to() {
 }
 
 function scrub() {
-  rm -fr "$ASDF_HOME/installs/**/**/share"
-  rm -fr "$ASDF_HOME/installs/java/**/man"
-  rm -fr "$ASDF_HOME/installs/python/**/lib/**/test"
-  rm -fr "$ASDF_HOME/installs/golang/**/go/test"
+  rm -fr "$ASDF_DATA_DIR/installs/**/**/share"
+  rm -fr "$ASDF_DATA_DIR/installs/java/**/man"
+  rm -fr "$ASDF_DATA_DIR/installs/python/**/lib/**/test"
+  rm -fr "$ASDF_DATA_DIR/installs/golang/**/go/test"
   rm -fr /usr/share/doc/
   rm -fr /usr/share/dotnet/sdk/NuGetFallbackFolder
   rm -fr /var/cache/apt/archives/
@@ -55,4 +55,4 @@ fi
 
 switch_to java "adopt-openjdk-${LM_JAVA_VERSION:-8}"
 # shellcheck source=/dev/null
-. "$ASDF_HOME/plugins/java/set-java-home.sh"
+. "$ASDF_DATA_DIR/plugins/java/set-java-home.sh"