summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2017-07-10 14:38:10 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-07-10 14:38:10 +0000
commit30569ceb06419dee62b8c2a25d589409397caf34 (patch)
tree2c4b6e0b3677eb3caa73ff46fa099b2127d5e8b6 /docker
parent65077872cc6c8d4639a58d3f55bc473c1888311c (diff)
parentf9be90c62bc013adb8806383158d4866d4efc952 (diff)
Merge "Stop redefining $HOME"
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile7
-rw-r--r--docker/Dockerfile.aarch647
2 files changed, 4 insertions, 10 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4465e9182..7db184f43 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -28,13 +28,10 @@ ARG FUNCTEST_DIR=/usr/local/lib/python2.7/dist-packages/functest/
ARG REPOS_VNFS_DIR=${REPOS_DIR}/vnfs
# Environment variables
-ENV HOME /home/opnfv
ENV CONFIG_FUNCTEST_YAML ${FUNCTEST_DIR}/ci/config_functest.yaml
-ENV REPOS_DIR ${HOME}/repos
+ENV REPOS_DIR ${REPOS_DIR}
ENV creds ${FUNCTEST_CONF_DIR}/openstack.creds
-WORKDIR ${HOME}
-
# Packaged dependencies
RUN apt-get update && apt-get install -y \
build-essential \
@@ -130,4 +127,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 ". ${FUNCTEST_DIR}/cli/functest-complete.sh" >> ${HOME}/.bashrc
+RUN echo ". ${FUNCTEST_DIR}/cli/functest-complete.sh" >> /root/.bashrc
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index 496d351b8..1339e5e96 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -27,13 +27,10 @@ ARG FUNCTEST_DIR=/usr/local/lib/python2.7/dist-packages/functest/
ARG REPOS_VNFS_DIR=${REPOS_DIR}/vnfs
# Environment variables
-ENV HOME /home/opnfv
ENV CONFIG_FUNCTEST_YAML ${FUNCTEST_DIR}/functest/ci/config_functest.yaml
-ENV REPOS_DIR ${HOME}/repos
+ENV REPOS_DIR ${REPOS_DIR}
ENV creds ${FUNCTEST_CONF_DIR}/openstack.creds
-WORKDIR ${HOME}
-
# Packaged dependencies
RUN apt-get update && apt-get install -y \
build-essential \
@@ -128,4 +125,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 ". ${FUNCTEST_DIR}/cli/functest-complete.sh" >> ${HOME}/.bashrc
+RUN echo ". ${FUNCTEST_DIR}/cli/functest-complete.sh" >> /root/.bashrc