From d660cc80ad15d36c467ebac3b50000a8a194b537 Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Wed, 18 Dec 2019 14:27:57 -0700
Subject: Move env var to Dockerfile and fix php composer install

---
 Dockerfile    | 13 +++++++++++--
 config/bashrc | 10 ----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 96b8e17..8f9f1fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,20 @@
 FROM debian:stable-slim
+ENV BUNDLE_JOBS=8
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV HISTFILESIZE=0
+ENV HISTSIZE=0
 ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US:en
 ENV LC_ALL=en_US.UTF-8
 ENV LICENSE_FINDER_VERSION=5.11.1
+ENV LM_HOME=/opt/license-management/
 ENV PATH="${PATH}:/root/.asdf/shims:/root/.asdf/bin"
+ENV RUBY_GC_HEAP_INIT_SLOTS=800000
+ENV RUBY_GC_MALLOC_LIMIT=79000000
+ENV RUBY_HEAP_FREE_MIN=100000
+ENV RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
+ENV RUBY_HEAP_SLOTS_INCREMENT=400000
 ENV TERM="xterm"
-ENV LM_HOME=/opt/license-management/
 COPY . /opt/license-management/
 RUN ln -sfn $LM_HOME/config/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc \
   && ln -sfn $LM_HOME/config/02nocache /etc/apt/apt.conf.d/02nocache \
@@ -85,7 +94,7 @@ RUN ln -sfn $LM_HOME/config/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc \
   && asdf plugin-add java \
   && asdf plugin-add maven \
   && asdf plugin-add nodejs \
-  && asdf plugin-add php \
+  && asdf plugin-add php https://github.com/mokhan/asdf-php.git \
   && asdf plugin-add python \
   && asdf plugin-add ruby \
   && asdf plugin-add yarn \
diff --git a/config/bashrc b/config/bashrc
index 3d11d41..d9d8a2e 100644
--- a/config/bashrc
+++ b/config/bashrc
@@ -1,12 +1,2 @@
-export BUNDLE_JOBS=8
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-export HISTFILESIZE=0
-export HISTSIZE=0
-export RUBY_GC_HEAP_INIT_SLOTS=800000
-export RUBY_GC_MALLOC_LIMIT=79000000
-export RUBY_HEAP_FREE_MIN=100000
-export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
-export RUBY_HEAP_SLOTS_INCREMENT=400000
-
 . $HOME/.asdf/asdf.sh
 . $HOME/.asdf/completions/asdf.bash
-- 
cgit v1.2.3