From 5f717c077757da3ed264b3e048ce59b42d50f0c8 Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Fri, 24 Jan 2020 16:39:54 -0700
Subject: Install cmake and skip locales

---
 Dockerfile | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index 449f7de..164274e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,20 +16,20 @@ ENV LM_HOME=/opt/license-management
 ENV PATH="${PATH}:/root/.asdf/shims:/root/.asdf/bin"
 ENV TERM="xterm"
 ENV HOME=/root
-COPY config/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
-COPY config/02nocache /etc/apt/apt.conf.d/02nocache
-COPY --from=gem-builder /opt/license-management/*.gem $LM_HOME/
 WORKDIR $HOME
-RUN apt-get update -q \
-  && apt-get install -y --no-install-recommends \
-  apt-utils \
+COPY config/* /root/
+RUN mv /root/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc && \
+  mv /root/02nocache /etc/apt/apt.conf.d/02nocache && \
+  apt-get update -q && apt-get install -y --no-install-recommends \
   apt-transport-https \
+  apt-utils \
   autoconf \
   automake \
   bison \
   bsdmainutils \
   build-essential \
   bzip2 \
+  cmake \
   coreutils \
   curl \
   default-libmysqlclient-dev \
@@ -57,8 +57,6 @@ RUN apt-get update -q \
   libxml2-dev \
   libxslt-dev \
   libyaml-dev \
-  locales \
-  locales-all \
   locate \
   mono-devel \
   openssl \
@@ -71,11 +69,8 @@ RUN apt-get update -q \
   zlib1g \
   zlib1g-dev \
   && 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/9/prod.list \
-  && apt-get update -q \
-  && apt-get install -y --no-install-recommends \
-  dotnet-sdk-3.1 \
-  && locale-gen en_US.UTF-8 \
+  && 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 \
   && asdf plugin-add golang \
   && asdf plugin-add java \
@@ -85,20 +80,22 @@ RUN apt-get update -q \
   && asdf plugin-add python \
   && asdf plugin-add ruby \
   && bash $HOME/.asdf/plugins/nodejs/bin/import-release-team-keyring \
-  && rm -fr /*.deb \
-  && rm -fr /var/lib/apt/lists/* \
-  && rm -fr /var/cache/apt/archives/ \
-  && rm -fr /usr/share/doc/ \
+  && asdf install && asdf current \
   && rm -fr $HOME/.asdf/installs/**/**/share \
-  && rm -fr $HOME/.asdf/installs/python/**/lib/**/test \
   && rm -fr $HOME/.asdf/installs/java/**/man \
+  && rm -fr $HOME/.asdf/installs/python/**/lib/**/test \
+  && rm -fr /*.deb \
+  && rm -fr /*.deb \
+  && rm -fr /usr/share/doc/ \
+  && rm -fr /usr/share/doc/ \
   && rm -fr /usr/share/dotnet/sdk/NuGetFallbackFolder \
+  && rm -fr /var/cache/apt/archives/ \
+  && rm -fr /var/cache/apt/archives/ \
+  && rm -fr /var/lib/apt/lists/* \
+  && rm -fr /var/lib/apt/lists/* \
   && rm -fr /tmp \
   && mkdir -p /tmp
-WORKDIR $HOME
-COPY config/* ./
-COPY config/NuGet /root/.config/NuGet
-RUN asdf install && asdf current
+COPY --from=gem-builder /opt/license-management/*.gem $LM_HOME/
 COPY test /test
 COPY run.sh /
 ENTRYPOINT ["/run.sh"]
-- 
cgit v1.2.3