From 8df012ea356bb7148b0d2a1e9e1c52379a4fc220 Mon Sep 17 00:00:00 2001
From: lcappelli <laura.cappelli@cnaf.infn.it>
Date: Fri, 18 Nov 2022 16:32:01 +0100
Subject: [PATCH] Fix another path issue in gitlab CI
Provide two cases: one to install nginx httpg, one for nginx stable
---
.gitlab-ci.yml | 2 +-
docker/Dockerfile | 12 ++++++++++--
docker/nginx.repo | 15 +++++++++++++++
3 files changed, 26 insertions(+), 3 deletions(-)
create mode 100644 docker/nginx.repo
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7a18d0..93223b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,4 +50,4 @@ build-ngx-httpg-container:
- docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
- export DOCKER_REGISTRY_HOST=${CI_REGISTRY}
- export DOCKER_REGISTRY_NAMESPACE=${CI_PROJECT_PATH}
- - build-docker-image.sh && push-docker-image.sh
+ - cd docker && build-docker-image.sh && push-docker-image.sh
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4d9c517..eaa4e7a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -16,9 +16,17 @@ RUN yum update -y && \
mkdir /pkgs && \
yum clean all && rm -rf /var/cache/yum
-# install nginx with patch for HTTPG and voms dynamic module
COPY *.rpm /pkgs/
-RUN rpm -ivh /pkgs/nginx-1.22.1-1.el7.ngx.x86_64.rpm && \
+
+# CASE 1 (install nginx httpg)
+RUN rpm -ivh /pkgs/nginx-1.22.1-1.el7.ngx.x86_64.rpm
+
+# CASE 2 (install nginx stable)
+# COPY nginx.repo /etc/yum.repos.d/nginx.repo
+# RUN yum -y install nginx
+
+# install njs and voms dynamic modules
+RUN yum install -y nginx-module-njs && \
rpm -ivh /pkgs/nginx-module-http-voms-1.22.1-1.el7.x86_64.rpm
# import test
diff --git a/docker/nginx.repo b/docker/nginx.repo
new file mode 100644
index 0000000..55e3e2b
--- /dev/null
+++ b/docker/nginx.repo
@@ -0,0 +1,15 @@
+[nginx-stable]
+name=nginx stable repo
+baseurl=http://nginx.org/packages/centos/\$releasever/\$basearch/
+gpgcheck=1
+enabled=1
+gpgkey=https://nginx.org/keys/nginx_signing.key
+module_hotfixes=true
+
+[nginx-mainline]
+name=nginx mainline repo
+baseurl=http://nginx.org/packages/mainline/centos/\$releasever/\$basearch/
+gpgcheck=1
+enabled=0
+gpgkey=https://nginx.org/keys/nginx_signing.key
+module_hotfixes=true
--
GitLab