From e2616ac7a0c5ab68e859eaf6f0aaf094805614ef Mon Sep 17 00:00:00 2001 From: Marek Obuchowicz Date: Thu, 23 Nov 2023 16:26:47 +0100 Subject: [PATCH] Fix merge conflicts --- generator/src/templates/nginx/http/error.conf.twig | 4 ---- images/common/services/tideways/Dockerfile | 4 ---- 2 files changed, 8 deletions(-) diff --git a/generator/src/templates/nginx/http/error.conf.twig b/generator/src/templates/nginx/http/error.conf.twig index 6598e689a..2d61cf199 100644 --- a/generator/src/templates/nginx/http/error.conf.twig +++ b/generator/src/templates/nginx/http/error.conf.twig @@ -1,6 +1,2 @@ error_page 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 422 425 426 428 429 431 451 /errorpage/4xx.html; error_page 500 501 502 504 505 506 507 508 509 510 511 /errorpage/5xx.html; -<<<<<<< HEAD - error_page 503 /maintenance/index.html; -======= ->>>>>>> be9d026 (Don't use custom error page for 503) diff --git a/images/common/services/tideways/Dockerfile b/images/common/services/tideways/Dockerfile index 3abda2a4b..541050438 100644 --- a/images/common/services/tideways/Dockerfile +++ b/images/common/services/tideways/Dockerfile @@ -6,11 +6,7 @@ ENV TIDEWAYS_ENVIRONMENT=$TIDEWAYS_ENVIRONMENT_DEFAULT RUN apt update -y && apt install -yq --no-install-recommends gnupg2 curl sudo ca-certificates wget RUN echo 'deb https://packages.tideways.com/apt-packages-main any-version main' > /etc/apt/sources.list.d/tideways.list && \ -<<<<<<< HEAD wget -qO - 'https://packages.tideways.com/key.gpg' | apt-key add - -======= - wget -qO - https://packages.tideways.com/key.gpg | sudo apt-key add - ->>>>>>> a6dfcfe (Upgrade tideways repository) RUN DEBIAN_FRONTEND=noninteractive apt update -y && apt install -yq tideways-daemon && \ apt autoremove --assume-yes && \ apt clean && \