From c66ca106960f2db19b8271c921a88e0d28b6ac7b Mon Sep 17 00:00:00 2001
From: lcappelli <laura.cappelli@cnaf.infn.it>
Date: Fri, 18 Nov 2022 16:17:53 +0100
Subject: [PATCH] Install ngx-httpg and voms rpm in a new container
---
.env | 2 +-
.gitlab-ci.yml | 8 ++++++--
docker/Dockerfile | 7 ++++---
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/.env b/.env
index 64d9a29..8b0e8c1 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
-DOCKER_IMAGE=storm2/vanilla-nginx-voms
+DOCKER_IMAGE=storm2/nginx-httpg-voms
DOCKER_VERBOSE=y
DOCKER_GIT_TAG_ENABLED=y
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3dc698e..d7a18d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,5 +45,9 @@ build-ngx-httpg-container:
- apk add git bash
- git clone https://baltig.infn.it/mw-devel/helper-scripts.git helper-scripts
- cp helper-scripts/scripts/* /usr/local/bin
- - cp ${CI_PROJECT_DIR}/ngx-artifacts/* ${CI_PROJECT_DIR}/docker/
- - cp ${CI_PROJECT_DIR}/voms-artifacts/* ${CI_PROJECT_DIR}/docker/
+ - cp ${CI_PROJECT_DIR}/ngx-artifacts/nginx-1.22.1-1.el7.ngx.x86_64.rpm ${CI_PROJECT_DIR}/docker/
+ - cp ${CI_PROJECT_DIR}/voms-artifacts/nginx-module-http-voms-1.22.1-1.el7.x86_64.rpm ${CI_PROJECT_DIR}/docker/
+ - 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
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8fbe82e..4d9c517 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -16,9 +16,10 @@ RUN yum update -y && \
mkdir /pkgs && \
yum clean all && rm -rf /var/cache/yum
-# install nginx with patch for HTTPG and voms module
-COPY ngx-artifacts/*.rpm /pkgs/
-COPY voms-artifacts/*.rpm /pkgs/
+# 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 && \
+ rpm -ivh /pkgs/nginx-module-http-voms-1.22.1-1.el7.x86_64.rpm
# import test
COPY t /home/nginx/t
--
GitLab