Skip to content

Commit

Permalink
Readme updated
Browse files Browse the repository at this point in the history
  • Loading branch information
gardart committed Sep 26, 2019
1 parent 9814312 commit 0430a30
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 61 deletions.
19 changes: 4 additions & 15 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -120,26 +120,15 @@ RUN systemctl enable naemon
#RUN pip install supervisor-quick

# Remove cache and default passwd files
RUN rm -rf /var/cache/yum /etc/nagios/passwd /etc/thruk/htpasswd

# Copy supervisor config over to the container
#COPY supervisord.conf /etc/supervisord.conf

# Copy custom supervisor init.d script (for nagios start|stop)
#COPY naemon-supervisor-wrapper.sh /usr/bin/naemon-supervisor-wrapper.sh
#RUN sed -i 's|^\(nagios_init_script\)=\(.*\)$|\1="sudo /usr/bin/naemon-supervisor-wrapper.sh"|g' /etc/adagios/adagios.conf
#RUN echo "naemon ALL=NOPASSWD: /usr/bin/naemon-supervisor-wrapper.sh" >> /etc/sudoers

# Create childlogdir
#RUN mkdir /var/log/supervisor
RUN rm -rf /var/cache/yum /etc/nagios/passwd

# Copy over our custom init script
#COPY run.sh /usr/bin/run.sh

# Make run.sh and supervisor wrapper script executable
#RUN chmod 755 /usr/bin/run.sh /usr/bin/naemon-supervisor-wrapper.sh
# Make run.sh script executable
#RUN chmod 755 /usr/bin/run.sh

#WORKDIR /etc/naemon
WORKDIR /etc/naemon

#ENTRYPOINT ["/bin/bash", "/usr/bin/run.sh"]

Expand Down
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,18 @@ docker create \

Log in with user `thrukadmin` and password `thrukadmin`

## Building

```
git clone https://github.com/opinkerfi/docker-adagios-rpm.git
cd docker-adagios-rpm
docker build -t adagios_systemd_image .
docker run --cap-add=SYS_ADMIN --name adagios -v /sys/fs/cgroup:/sys/fs/cgroup -p 8080:80 -d adagios_systemd_image
```

Then you should be able to access http://localhost:8080
Log in with user `thrukadmin` and password `thrukadmin`

## Parameters

The parameters are split into two halves, separated by a colon, the left hand side representing the host and the right the container side.
Expand Down
11 changes: 0 additions & 11 deletions naemon-supervisor-wrapper.sh

This file was deleted.

3 changes: 2 additions & 1 deletion run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@ do
[[ -x "$script" ]] && "$script"
done

exec /usr/bin/supervisord -n -c /etc/supervisord.conf
#systemctl restart httpd
#systemctl restart naemon
34 changes: 0 additions & 34 deletions supervisord.conf

This file was deleted.

0 comments on commit 0430a30

Please sign in to comment.