From 40ba813c95fada6db86d4275501dae116bf23fa1 Mon Sep 17 00:00:00 2001
From: Tomasz Naskret <tomasz.naskret@pwr.edu.pl>
Date: Mon, 10 Feb 2025 13:43:07 +0000
Subject: [PATCH 1/2] Update httpd.conf prevent dir browsing
---
httpd.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/httpd.conf b/httpd.conf
index ae0108b..e99c6a3 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -276,7 +276,7 @@ DocumentRoot "/usr/local/apache2/htdocs"
# http://httpd.apache.org/docs/2.4/mod/core.html#options
# for more information.
#
- Options Indexes FollowSymLinks
+ Options FollowSymLinks
#
# AllowOverride controls what directives may be placed in .htaccess files.
--
GitLab
From fbac1c95dddf6038831aaf3e5edf3435e30adfd8 Mon Sep 17 00:00:00 2001
From: Bartosz Walkowiak <bartosz.walkowiak@pwr.edu.pl>
Date: Mon, 10 Feb 2025 14:22:51 +0000
Subject: [PATCH 2/2] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e6d0a6..0967885 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: docker:18.09.7
+image: docker:23.0.3
stages:
- build
@@ -6,11 +6,14 @@ stages:
build_image:
stage: build
+ image: docker:23.0.3
services:
- - docker:18.09.7-dind
+ - 'docker:23.0.3-dind'
+ before_script:
+ - until docker info; do sleep 1; done
script:
- if [ "$CI_COMMIT_REF_NAME" == "master" ]; then TAG="latest"; else TAG="develop"; fi
- - docker build -t $CI_REGISTRY_IMAGE:$TAG .
+ - docker build -t $CI_REGISTRY_IMAGE:$TAG -o type=docker .
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker push $CI_REGISTRY_IMAGE:$TAG
--
GitLab