openstack/openstack-helm-images
Code Issues Proposed changes

Nagios docker update

Browse Source 
Added an ENV variable to help with jenkins build

Change-Id: If861ba14de00966ec4fe0b12001902755bf94338
This commit is contained in:
Radhika Pai
2020-04-15 14:10:13 -05:00
parent da352c0880
commit ebd82b5e49
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nagios/Dockerfile.ubuntu_bionic
View File

@@ -1,6 +1,7 @@
ARG FROM=docker.io/ubuntu:bionic ARG FROM=docker.io/ubuntu:bionic
FROM ${FROM} FROM ${FROM}
ENV DEBIAN_FRONTEND=noninteractive
ENV APACHE_FRONTEND_PORT 8000 ENV APACHE_FRONTEND_PORT 8000
ENV APACHE_FRONTEND_SECURE_PORT 8443 ENV APACHE_FRONTEND_SECURE_PORT 8443
ENV ES_DSL_VERSION=5.4.0 ENV ES_DSL_VERSION=5.4.0
@@ -20,7 +21,7 @@ RUN apt-get -o Acquire::ForceIPv4=true -y update \
RUN rm -f /usr/bin/python RUN rm -f /usr/bin/python
RUN ln -s /usr/bin/python3 /usr/bin/python RUN ln -s /usr/bin/python3 /usr/bin/python
RUN pip3 --no-cache-dir install --upgrade pip3 \ RUN pip3 install --upgrade pip \
&& hash -r \ && hash -r \
&& pip3 --no-cache-dir install --upgrade setuptools \ && pip3 --no-cache-dir install --upgrade setuptools \
&& pip3 --no-cache-dir install --upgrade kubernetes \ && pip3 --no-cache-dir install --upgrade kubernetes \

1
nagios/Dockerfile.ubuntu_xenial
View File

@@ -1,6 +1,7 @@
ARG FROM=docker.io/ubuntu:xenial ARG FROM=docker.io/ubuntu:xenial
FROM ${FROM} FROM ${FROM}
ENV DEBIAN_FRONTEND=noninteractive
ENV APACHE_FRONTEND_PORT 8000 ENV APACHE_FRONTEND_PORT 8000
ENV APACHE_FRONTEND_SECURE_PORT 8443 ENV APACHE_FRONTEND_SECURE_PORT 8443
ENV ES_DSL_VERSION=5.4.0 ENV ES_DSL_VERSION=5.4.0