fix healthcheck and dockerfile label
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
29d9ea4193
commit
8d842b8393
@ -1,7 +1,7 @@
|
||||
FROM alpine:3.10.0
|
||||
|
||||
LABEL maintainer="Robert Kaussow <mail@geeklabor.de>" \
|
||||
org.label-schema.name="TT-RSS" \
|
||||
org.label-schema.name="Kanboard" \
|
||||
org.label-schema.version="1.2" \
|
||||
org.label-schema.vendor="Robert Kaussow" \
|
||||
org.label-schema.schema-version="1.0"
|
||||
@ -13,7 +13,7 @@ RUN apk --update add --virtual .build-deps tar curl && \
|
||||
apk --update add nginx ca-certificates s6 ssmtp mailx php7 php7-phar php7-curl \
|
||||
php7-fpm php7-json php7-zlib php7-xml php7-dom php7-ctype php7-opcache php7-zip php7-iconv \
|
||||
php7-pdo php7-pdo_mysql php7-pdo_sqlite php7-pdo_pgsql php7-mbstring php7-session php7-bcmath \
|
||||
php7-gd php7-mcrypt php7-openssl php7-sockets php7-posix php7-ldap php7-simplexml && \
|
||||
php7-gd php7-mcrypt php7-openssl php7-sockets php7-posix php7-ldap php7-simplexml && \
|
||||
rm -rf /var/www/localhost && \
|
||||
rm -f /etc/php7/php-fpm.d/www.conf && \
|
||||
mkdir -p /var/www/app && \
|
||||
|
@ -6,12 +6,4 @@ URL=http://localhost
|
||||
wget --quiet --tries=1 --spider ${URL}
|
||||
[ $? -ne 0 ] && exit 1
|
||||
|
||||
CONTENT=$(wget --quiet -O - ${URL})
|
||||
case "$CONTENT" in
|
||||
*Exception*) exit 1 ;;
|
||||
*alert-*alert-*SELF_URL_PATH*) exit 1 ;;
|
||||
*alert-*SELF_URL_PATH*alert-*) exit 1 ;;
|
||||
*SELF_URL_PATH*alert-*alert-*) exit 1 ;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
|
Reference in New Issue
Block a user