From 8f32c7b5a9fd2fa6b1271779714d9fd15e2496ef Mon Sep 17 00:00:00 2001 From: Piotr Halama Date: Thu, 25 Jun 2026 10:50:36 +0200 Subject: [PATCH 1/2] Update gitserver image --- tests/gitserver/Dockerfile | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/tests/gitserver/Dockerfile b/tests/gitserver/Dockerfile index fb250f353..1917fa4f3 100644 --- a/tests/gitserver/Dockerfile +++ b/tests/gitserver/Dockerfile @@ -1,11 +1,6 @@ -FROM europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.24.0 +FROM europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.24.1 -RUN apk add --no-cache git-daemon && \ - # apache2 and apache2-utils need to be in version smaller or equal to 2.4.58-r0 - # issue: https://github.com/kyma-project/serverless/issues/998 - apk add --no-cache apache2=2.4.58-r0 apache2-utils=2.4.58-r0 --repository http://dl-cdn.alpinelinux.org/alpine/v3.15/main && \ - apk upgrade --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ - expat +RUN apk add --no-cache git-daemon apache2 apache2-utils COPY ./etc/git.conf /etc/apache2/conf.d/git.conf COPY ./etc/httpd.conf /etc/apache2/httpd.conf @@ -13,9 +8,9 @@ RUN git config --system http.receivepack true &&\ git config --system http.uploadpack true &&\ git config --global user.email "gitserver@kyma-project.io" &&\ git config --global user.name "Git Server" -ENV APACHE_LOG_DIR /var/log/apache2 -ENV APACHE_LOCK_DIR /var/lock/apache2 -ENV APACHE_PID_FILE /var/run/apache2.pid +ENV APACHE_LOG_DIR=/var/log/apache2 +ENV APACHE_LOCK_DIR=/var/lock/apache2 +ENV APACHE_PID_FILE=/var/run/apache2.pid COPY ./etc/init_repos.sh /tmp/init_repos.sh COPY ./repos /tmp/repos From 97e1f0fe8b89224e283c2203c3b0c16481d48313 Mon Sep 17 00:00:00 2001 From: Piotr Halama Date: Thu, 25 Jun 2026 11:11:16 +0200 Subject: [PATCH 2/2] update handler to nodejs26 --- tests/gitserver/repos/function/handler.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/gitserver/repos/function/handler.js b/tests/gitserver/repos/function/handler.js index 4f4732bb1..2b8de50d7 100644 --- a/tests/gitserver/repos/function/handler.js +++ b/tests/gitserver/repos/function/handler.js @@ -1,5 +1,5 @@ module.exports = { - main: function (event, context) { - return 'GITOPS 1' - } -} \ No newline at end of file + main: function (req, res) { + res.send("GITOPS 1"); + }, +};