diff options
| author |   Areli Fuss <af732p@att.com> | 2017-10-18 15:22:40 +0300 |
|---|---|---|
| committer | Areli Fuss <af732p@att.com> | 2017-10-18 15:22:40 +0300 |
| commit | b571ddb3f9f4a42f79977421eab5f0b982a1ca61 (patch) | |
| tree | 13e4d0a89c12b13f51c2e55c844f718a16d164a2 | |
| parent | 0b191794fff01386c1be8e975e51b8f3e5959de1 (diff) | |
Update Dockerfile user to enable apt-get
Due to change in the base container
it is needed to replace the default user
before the apt-get commands in dockers
that are based on jetty:9.3-jre8
Change-Id: I675654c638d4e1bc81b1d1ae0509935aa5b1107e
Issue-Id: SDC-477
Signed-off-by: Areli Fuss <af732p@att.com>
| -rw-r--r-- | base_sdc-backend/Dockerfile | 7 | ||||
| -rw-r--r-- | base_sdc-frontend/Dockerfile | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/base_sdc-backend/Dockerfile b/base_sdc-backend/Dockerfile index 2bdc6d8..b363160 100644 --- a/base_sdc-backend/Dockerfile +++ b/base_sdc-backend/Dockerfile @@ -7,9 +7,11 @@ ENV HTTP_PROXY ${HTTP_PROXY} ENV HTTPS_PROXY ${HTTPS_PROXY} RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \ - if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi + if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi +USER root + RUN apt-get -y update && apt-get -y install \ apt-utils \ curl \ @@ -22,8 +24,11 @@ RUN apt-get -y update && apt-get -y install \ gcc \ python-pip +USER jetty + # install chef-solo RUN curl -L https://omnitruck.chef.io/install.sh | bash RUN pip install pycurl + diff --git a/base_sdc-frontend/Dockerfile b/base_sdc-frontend/Dockerfile index 5a8e9e0..886a83e 100644 --- a/base_sdc-frontend/Dockerfile +++ b/base_sdc-frontend/Dockerfile @@ -7,12 +7,16 @@ ENV HTTP_PROXY ${HTTP_PROXY} ENV HTTPS_PROXY ${HTTPS_PROXY} RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \ - if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi + if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi + +USER root RUN apt-get -y update && apt-get -y install \ apt-utils \ curl \ vim +USER jetty + # install chef-solo RUN curl -L https://omnitruck.chef.io/install.sh | bash |