From 0e9c47c01bfde078c79e95c17b1b5e645335e6ad Mon Sep 17 00:00:00 2001 From: ThomasSamson Date: Thu, 11 Jan 2024 15:33:28 +0100 Subject: [PATCH 1/4] Add robot TXT --- 3.0-custom/Dockerfile | 2 +- 3.0-custom/robot.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 3.0-custom/robot.txt diff --git a/3.0-custom/Dockerfile b/3.0-custom/Dockerfile index 63485a0..5ee5136 100644 --- a/3.0-custom/Dockerfile +++ b/3.0-custom/Dockerfile @@ -49,7 +49,7 @@ RUN chown -R www-data: /var/www/html/conf # Add Apache conf ADD ./apache2.conf /etc/apache2/sites-available/000-default.conf ADD ./ports.conf /etc/apache2/ports.conf - +ADD ./robots.txt /var/www/html/robots.txt # Add crontab config ADD ./itop-background-task.cron /var/www/html/ #Configure the crontab diff --git a/3.0-custom/robot.txt b/3.0-custom/robot.txt new file mode 100644 index 0000000..77470cb --- /dev/null +++ b/3.0-custom/robot.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: / \ No newline at end of file From 6573c690e43d5c0519d8a264459ea85f8cb7aeda Mon Sep 17 00:00:00 2001 From: ThomasSamson Date: Thu, 11 Jan 2024 15:36:43 +0100 Subject: [PATCH 2/4] fix name --- 3.0-custom/{robot.txt => robots.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 3.0-custom/{robot.txt => robots.txt} (100%) diff --git a/3.0-custom/robot.txt b/3.0-custom/robots.txt similarity index 100% rename from 3.0-custom/robot.txt rename to 3.0-custom/robots.txt From b24b8accd531dc33389d0315f660737d7fdf0678 Mon Sep 17 00:00:00 2001 From: ThomasSamson Date: Thu, 11 Jan 2024 16:02:58 +0100 Subject: [PATCH 3/4] fix build fail --- 3.0-custom/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3.0-custom/Dockerfile b/3.0-custom/Dockerfile index 5ee5136..1064785 100644 --- a/3.0-custom/Dockerfile +++ b/3.0-custom/Dockerfile @@ -9,7 +9,7 @@ ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/do # install extra packages RUN apt-get update \ - && apt-get install -y \ + && apt-get install -y --no-install-recommends \ graphviz \ mariadb-client \ unzip \ From 49a2f44e6038ab2f43284e6b839840edb18beafc Mon Sep 17 00:00:00 2001 From: ThomasSamson Date: Thu, 11 Jan 2024 16:52:02 +0100 Subject: [PATCH 4/4] Fix CVE --- 3.0-custom/Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/3.0-custom/Dockerfile b/3.0-custom/Dockerfile index 1064785..cddf573 100644 --- a/3.0-custom/Dockerfile +++ b/3.0-custom/Dockerfile @@ -23,6 +23,15 @@ RUN apt-get update \ linux-libc-dev \ openssl \ apache2 \ + libc-bin \ + liblua5.3-0 \ + libncurses6 \ + libncursesw6 \ + libnghttp2-14 \ + libtinfo6 \ + ncurses-base \ + ncurses-bin \ + libc-dev-bin \ && chmod uga+x /usr/local/bin/install-php-extensions \ && install-php-extensions \ apcu \