diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-06-15 21:00:04 +0200 |
|---|---|---|
| committer |   jose.lausuch <jose.lausuch@ericsson.com> | 2017-06-21 13:24:26 +0200 |
| commit | 295d8bf6fd67cefbdc58a950683c0451bb670e86 (patch) | |
| tree | d8fa536f43ee4fb0f30b71fffea35a41e8252ce6 | |
| parent | 572ef8dd7a109dead80c6f7a97aef34dc594c7c8 (diff) | |
Stop personalizing the common Dockerfile
Any personal config can be applied to another Dockerfile which
inherits from this one.
Change-Id: Ifb77c0d5821c2b40f2f3e1d6adee6f83d0cd0b29
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | docker/Dockerfile | 10 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64 | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 95c4df30d..c13fc82e1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -36,8 +36,6 @@ ENV HOME /home/opnfv ENV CONFIG_FUNCTEST_YAML ${FUNCTEST_REPO_DIR}/functest/ci/config_functest.yaml ENV REPOS_DIR ${HOME}/repos ENV creds ${FUNCTEST_CONF_DIR}/openstack.creds -ENV TERM xterm -ENV COLORTERM gnome-terminal WORKDIR ${HOME} @@ -165,10 +163,4 @@ RUN sh -c 'curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -' \ && cd ${REPOS_DIR}/promise && sudo npm -g install npm@latest \ && cd ${REPOS_DIR}/promise/source && npm install -RUN echo "set nocompatible \n\ -set backspace=2" \ ->> ${HOME}/.vimrc -RUN echo set nocompatible >> ${HOME}/.exrc -RUN echo "alias ll='ls -lh' \n\ -. ${FUNCTEST_REPO_DIR}/functest/cli/functest-complete.sh" \ ->> ${HOME}/.bashrc +RUN echo ". ${FUNCTEST_REPO_DIR}/functest/cli/functest-complete.sh" >> ${HOME}/.bashrc diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index 0c1b0024d..7014d33fc 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -35,8 +35,6 @@ ENV HOME /home/opnfv ENV CONFIG_FUNCTEST_YAML ${FUNCTEST_REPO_DIR}/functest/ci/config_functest.yaml ENV REPOS_DIR ${HOME}/repos ENV creds ${FUNCTEST_CONF_DIR}/openstack.creds -ENV TERM xterm -ENV COLORTERM gnome-terminal WORKDIR ${HOME} @@ -159,10 +157,4 @@ RUN sh -c 'wget -qO- https://nodejs.org/dist/v4.7.2/node-v4.7.2-linux-arm64.tar. && cd ${REPOS_DIR}/promise && sudo npm -g install npm@latest \ && cd ${REPOS_DIR}/promise/source && npm install -RUN echo "set nocompatible \n\ -set backspace=2" \ ->> ${HOME}/.vimrc -RUN echo set nocompatible >> ${HOME}/.exrc -RUN echo "alias ll='ls -lh' \n\ -. ${FUNCTEST_REPO_DIR}/functest/cli/functest-complete.sh" \ ->> ${HOME}/.bashrc +RUN echo ". ${FUNCTEST_REPO_DIR}/functest/cli/functest-complete.sh" >> ${HOME}/.bashrc |