Split the image

1 files changed, 13 insertions, 10 deletions

diff --git a/Dockerfile b/Dockerfile
index 5003d5b..dbb310e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,5 @@
+ARG IMAGE_VERSION=latest
+
 FROM debian:stable-slim AS gem-builder
 ENV LM_HOME=/opt/license-management
 WORKDIR $LM_HOME
@@ -11,17 +13,18 @@ RUN apt-get update -q \
   && apt-get install -y --no-install-recommends ruby \
   && gem build *.gemspec
 
-FROM debian:stable-slim AS asdf-builder
-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
-RUN bash /root/install.sh && bash -lc 'scrub'
+# The following stage can be extracted into a separate base image
+#FROM debian:stable-slim AS asdf-builder
+#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
+#RUN bash /root/install.sh && bash -lc 'scrub'
 
-FROM asdf-builder
+FROM registry.gitlab.com/gitlab-org/security-products/license-management/tools:${IMAGE_VERSION}
 ENV LM_HOME=/opt/license-management
 COPY --from=gem-builder /opt/license-management/*.gem $LM_HOME/
 RUN bash -lc 'gem install "$LM_HOME/*.gem"'