vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

1311 - remove buildmanager monit

Browse source
This commit is contained in:
Tom McKay 2019-01-29 17:28:10 -05:00
parent 40c0352dd1
commit 1ee2f0e3b2
5 changed files with 4 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile
View file

@ -52,7 +52,6 @@ RUN apt-get update && apt-get upgrade -y \
libsasl2-dev \
libsasl2-modules \
memcached \
monit \
nginx \
nodejs \
optipng \
@ -93,7 +92,7 @@ COPY static/ package.json tsconfig.json webpack.config.js tslint.json yarn.lock
RUN yarn install --ignore-engines
RUN mkdir -p /etc/my_init.d /etc/systlog-ng /usr/local/bin /etc/monit $QUAYDIR/static/fonts $QUAYDIR/static/ldn /usr/local/nginx/logs/
RUN mkdir -p /etc/my_init.d /etc/systlog-ng /usr/local/bin $QUAYDIR/static/fonts $QUAYDIR/static/ldn /usr/local/nginx/logs/
RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /root/.cache
VOLUME ["/var/log", "/datastorage", "/tmp"]
@ -130,11 +129,8 @@ RUN PYTHONPATH=$QUAYPATH venv/bin/python -m external_libraries
RUN curl -fsSL https://ip-ranges.amazonaws.com/ip-ranges.json -o util/ipresolver/aws-ip-ranges.json
# Set up the init system
RUN mkdir -p /etc/my_init.d /etc/systlog-ng /usr/local/bin /etc/monit static/fonts static/ldn /usr/local/nginx/logs/ \
RUN mkdir -p /etc/my_init.d /etc/systlog-ng /usr/local/bin static/fonts static/ldn /usr/local/nginx/logs/ \
&& cp $QUAYCONF/init/syslog-ng.conf /etc/syslog-ng/ \
&& cp $QUAYCONF/kill-buildmanager.sh /usr/local/bin/kill-buildmanager.sh \
&& cp $QUAYCONF/monitrc /etc/monit/monitrc \
&& chmod 0600 /etc/monit/monitrc \
&& cp $QUAYCONF/init/logrotate.conf /etc/logrotate.conf \
&& cp .git/HEAD GIT_HEAD \
&& rm -rf /etc/service/syslog-forwarder