Run CI for ngx-httpg-voms

.gitlab-ci.yml

@@ -23,28 +23,8 @@ build-all-rpm:
     paths:
       - artifacts/
 
-# build-ngx-httpg-container:
-#   stage: docker-build-ngx-httpg-voms
-#   image: docker:latest
-#   services:
-#     - name: docker:dind
-#       command: ["--tls=false"]
-#   dependencies:
-#     - build-all-rpm
-#   script:
-#     - apk add git bash
-#     - git clone https://baltig.infn.it/mw-devel/helper-scripts.git helper-scripts
-#     - cp helper-scripts/scripts/* /usr/local/bin
-#     - mkdir ${CI_PROJECT_DIR}/docker/artifacts/
-#     - cp ${CI_PROJECT_DIR}/artifacts/*.x86_64.rpm ${CI_PROJECT_DIR}/docker/artifacts/
-#     - rm ${CI_PROJECT_DIR}/docker/artifacts/*-debuginfo*.rpm
-#     - 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}
-#     - cd docker && build-docker-image.sh && push-docker-image.sh
-
-build-ngx-container:
-  stage: docker-build-ngx-voms
+build-ngx-httpg-container:
+  stage: docker-build-ngx-httpg-voms
   image: docker:latest
   services:
     - name: docker:dind
@@ -62,3 +42,23 @@ build-ngx-container:
     - export DOCKER_REGISTRY_HOST=${CI_REGISTRY}
     - export DOCKER_REGISTRY_NAMESPACE=${CI_PROJECT_PATH}
     - cd docker && build-docker-image.sh && push-docker-image.sh
+
+# build-ngx-container:
+#   stage: docker-build-ngx-voms
+#   image: docker:latest
+#   services:
+#     - name: docker:dind
+#       command: ["--tls=false"]
+#   dependencies:
+#     - build-all-rpm
+#   script:
+#     - apk add git bash
+#     - git clone https://baltig.infn.it/mw-devel/helper-scripts.git helper-scripts
+#     - cp helper-scripts/scripts/* /usr/local/bin
+#     - mkdir ${CI_PROJECT_DIR}/docker/artifacts/
+#     - cp ${CI_PROJECT_DIR}/artifacts/*.x86_64.rpm ${CI_PROJECT_DIR}/docker/artifacts/
+#     - rm ${CI_PROJECT_DIR}/docker/artifacts/*-debuginfo*.rpm
+#     - 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}
+#     - cd docker && build-docker-image.sh && push-docker-image.sh

docker/.env

-DOCKER_IMAGE=storm2/nginx-voms
+DOCKER_IMAGE=storm2/nginx-httpg-voms
 DOCKER_VERBOSE=y
 DOCKER_GIT_TAG_ENABLED=y

docker/Dockerfile

@@ -20,12 +20,12 @@ COPY artifacts/*.rpm /pkgs/
 COPY nginx.repo /etc/yum.repos.d/nginx.repo
 
 # install nginx httpg + voms and njs dynamic modules
-# 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 && \
-#     yum install -y nginx-module-njs
+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 && \
+    yum install -y nginx-module-njs
 
 # install nginx + voms and njs dynamic modules
-RUN yum -y install nginx nginx-module-njs && \
-    rpm -ivh /pkgs/nginx-module-http-voms-1.22.1-1.el7.x86_64.rpm
+# RUN yum -y install nginx nginx-module-njs && \
+#     rpm -ivh /pkgs/nginx-module-http-voms-1.22.1-1.el7.x86_64.rpm
 
 CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file