eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 14:36:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #1619 from nextcloud/change-healthchecks

Browse source 
change dockerfile links, add tzdata to fulltext, migrate healthchecks to nc
This commit is contained in:
Simon L 2022-12-29 16:40:28 +01:00 • committed by GitHub
commit c21087d6d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Containers/apache/Dockerfile
View file

@ -19,7 +19,6 @@ RUN set -ex; \
openssl \ openssl \
netcat \ netcat \
dpkg-dev \ dpkg-dev \
curl \
; \ ; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

2
Containers/apache/healthcheck.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
nc -z "$NEXTCLOUD_HOST" 9000 || exit 0 nc -z "$NEXTCLOUD_HOST" 9000 || exit 0
curl -skfI localhost:8000 || exit 1 nc -z localhost 8000 || exit 1
if [ "$APACHE_PORT" != '443' ]; then if [ "$APACHE_PORT" != '443' ]; then
nc -z localhost "$APACHE_PORT" || exit 1 nc -z localhost "$APACHE_PORT" || exit 1
else else

2
Containers/clamav/Dockerfile
View file

@ -1,4 +1,4 @@
# Probably from this file: https://github.com/Cisco-Talos/clamav/blob/main/Dockerfile # Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/0.105/alpine/Dockerfile
FROM clamav/clamav:0.105.1-7 FROM clamav/clamav:0.105.1-7
RUN apk add --update --no-cache tzdata RUN apk add --update --no-cache tzdata

2
Containers/domaincheck/Dockerfile
View file

@ -1,5 +1,5 @@
FROM alpine:3.16.3 FROM alpine:3.16.3
RUN apk add --update --no-cache lighttpd bash curl netcat-openbsd RUN apk add --update --no-cache lighttpd bash netcat-openbsd
RUN adduser -S www-data -G www-data RUN adduser -S www-data -G www-data
RUN rm -rf /etc/lighttpd/lighttpd.conf RUN rm -rf /etc/lighttpd/lighttpd.conf

10
Containers/fulltextsearch/Dockerfile
View file

@ -3,4 +3,12 @@ FROM elasticsearch:7.17.8
RUN elasticsearch-plugin install --batch ingest-attachment RUN elasticsearch-plugin install --batch ingest-attachment
HEALTHCHECK CMD curl -skfI localhost:9200 || exit 1 RUN set -ex; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
tzdata \
; \
rm -rf /var/lib/apt/lists/*
HEALTHCHECK CMD nc -z localhost 9200 || exit 1

2
Containers/imaginary/Dockerfile
View file

@ -6,8 +6,6 @@ RUN set -ex; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
ca-certificates \
curl \
netcat \ netcat \
; \ ; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

2
Containers/onlyoffice/Dockerfile
View file

@ -1,4 +1,4 @@
# From https://github.com/ONLYOFFICE/Docker-DocumentServer/blob/master/Dockerfile # From https://github.com/ONLYOFFICE/Docker-DocumentServer/blob/master/Dockerfile
FROM onlyoffice/documentserver:7.2.2.56 FROM onlyoffice/documentserver:7.2.2.56
HEALTHCHECK CMD curl -skfI localhost || exit 1 HEALTHCHECK CMD nc -z localhost 80 || exit 1

2
Containers/postgresql/Dockerfile
View file

@ -1,4 +1,4 @@
# From https://github.com/docker-library/postgres/blob/master/13/alpine/Dockerfile # From https://github.com/docker-library/postgres/blob/master/14/alpine/Dockerfile
FROM postgres:14.6-alpine FROM postgres:14.6-alpine
RUN apk add --update --no-cache bash openssl shadow netcat-openbsd grep mawk RUN apk add --update --no-cache bash openssl shadow netcat-openbsd grep mawk