update haproxy and image from repository

GON-3874-DD-moodle
Manuel Caballero 2022-11-16 12:07:49 +00:00 committed by Evilham
parent 2395789c9d
commit 2af96ac3c0
No known key found for this signature in database
GPG Key ID: AE3EE30D970886BF
4 changed files with 3 additions and 6 deletions

View File

@ -1,6 +1,7 @@
version: '3.7' version: '3.7'
services: services:
dd-waf-apache: dd-waf-apache:
image: registry.dd-work.space/dd/waf-apache:${DD_BUILD:-latest}
build: build:
context: ${BUILD_WAF_ROOT_PATH}/docker/modsecurity context: ${BUILD_WAF_ROOT_PATH}/docker/modsecurity
dockerfile: Dockerfile dockerfile: Dockerfile

View File

@ -1,6 +1,4 @@
# #
# Copyright © 2021,2022 IsardVDI S.L.
#
# This file is part of DD # This file is part of DD
# #
# DD is free software: you can redistribute it and/or modify # DD is free software: you can redistribute it and/or modify
@ -17,6 +15,7 @@
# along with DD. If not, see <https://www.gnu.org/licenses/>. # along with DD. If not, see <https://www.gnu.org/licenses/>.
# #
# SPDX-License-Identifier: AGPL-3.0-or-later # SPDX-License-Identifier: AGPL-3.0-or-later
ARG HAPROXY_IMG ARG HAPROXY_IMG
FROM $HAPROXY_IMG as production FROM $HAPROXY_IMG as production
@ -33,5 +32,4 @@ COPY docker-entrypoint.sh /usr/local/bin/
RUN ln -s /usr/local/bin/docker-entrypoint.sh / RUN ln -s /usr/local/bin/docker-entrypoint.sh /
RUN chmod 775 docker-entrypoint.sh RUN chmod 775 docker-entrypoint.sh
ADD haproxy.conf /usr/local/etc/haproxy/haproxy.normal.cfg ADD haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg
ADD haproxy.proxy-protocol.conf /usr/local/etc/haproxy/haproxy.proxy-protocol.cfg

View File

@ -21,8 +21,6 @@
# SPDX-License-Identifier: AGPL-3.0-or-later # SPDX-License-Identifier: AGPL-3.0-or-later
set -e set -e
ln -sf /usr/local/etc/haproxy/${HAPROXY_CFG:-haproxy.normal.cfg} /usr/local/etc/haproxy/haproxy.cfg
LETSENCRYPT_DOMAIN="$DOMAIN" letsencrypt.sh LETSENCRYPT_DOMAIN="$DOMAIN" letsencrypt.sh
if [ ! -e "/certs/chain.pem" ]; then if [ ! -e "/certs/chain.pem" ]; then