diff options
| author | mo khan <mo.khan@gmail.com> | 2020-02-23 20:22:40 -0700 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-02-23 20:22:40 -0700 |
| commit | f4b31dcc8e0bdbd5001ce52968b82641b4407c29 (patch) | |
| tree | 8c24af29bceafdf8f98c687df573d7fc2b57d146 | |
| parent | 43e195b6b76f6a0b694357bd2c74578cc496f9aa (diff) | |
Default to system package
| -rw-r--r-- | Dockerfile | 11 | ||||
| -rw-r--r-- | Dockerfile.tools | 2 | ||||
| -rw-r--r-- | config/.tool-versions | 20 | ||||
| -rw-r--r-- | config/install.sh | 11 |
4 files changed, 22 insertions, 22 deletions
@@ -13,17 +13,6 @@ RUN apt-get update -q \ && apt-get install -y --no-install-recommends ruby \ && gem build *.gemspec -# 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 ${TOOLS_IMAGE} ENV LM_HOME=/opt/license-management COPY --from=gem-builder /opt/license-management/*.gem $LM_HOME/ diff --git a/Dockerfile.tools b/Dockerfile.tools index 9974dcf..f877b43 100644 --- a/Dockerfile.tools +++ b/Dockerfile.tools @@ -1,6 +1,6 @@ FROM debian:stable-slim ENV ASDF_DATA_DIR="/opt/asdf" -ENV PATH="${PATH}:${ASDF_DATA_DIR}/shims:${ASDF_DATA_DIR}/bin" +ENV PATH="${ASDF_DATA_DIR}/shims:${ASDF_DATA_DIR}/bin:${PATH}" ENV TERM="xterm" ENV HOME=/root WORKDIR $HOME diff --git a/config/.tool-versions b/config/.tool-versions index 31e5d72..a888e56 100644 --- a/config/.tool-versions +++ b/config/.tool-versions @@ -1,11 +1,11 @@ -elixir 1.10.1 -golang 1.13.8 -gradle 6.2 -java adopt-openjdk-8u242-b08 -maven 3.6.3 -nodejs 10.18.0 -php 7.4.3 -python 3.8.1 2.7.17 -ruby 2.6.5 -rust 1.41.0 +elixir system +golang system +gradle system +java system +maven system +nodejs system +php system +python system +ruby system +rust system sbt 1.3.8 diff --git a/config/install.sh b/config/install.sh index 939d1a9..06c0dec 100644 --- a/config/install.sh +++ b/config/install.sh @@ -16,11 +16,15 @@ apt-get install -y --no-install-recommends \ cmake \ coreutils \ curl \ + default-jdk \ default-libmysqlclient-dev \ + elixir \ gettext \ git \ gnupg2 \ + golang \ gpg \ + gradle \ jq \ libcurl4 \ libcurl4-openssl-dev \ @@ -43,11 +47,18 @@ apt-get install -y --no-install-recommends \ libyaml-dev \ libzip-dev \ locate \ + maven \ mono-devel \ + nodejs \ openssl \ + php \ pkg-config \ + python2 \ + python3 \ re2c \ rebar \ + ruby \ + rustc \ software-properties-common \ unixodbc-dev \ unzip \ |