.devcontainer/Dockerfile

-FROM storm2/ngx-voms-build
+# Copyright 2018-2023 Istituto Nazionale di Fisica Nucleare
+# SPDX-License-Identifier: EUPL-1.2
 
-USER root
+FROM almalinux:9
 
-RUN yum install -y https://repo.ius.io/ius-release-el7.rpm centos-release-scl \
-    && yum install -y git224 devtoolset-10
+# Allow customization of build user ID and name
+ARG USERNAME=vscode
+ARG USER_UID=1000
+ARG USER_GID=${USER_UID}
 
-USER $BUILD_USER
+COPY library-scripts/*.sh /tmp/library-scripts/
+
+RUN \
+    sh /tmp/library-scripts/provide-dev-deps.sh && \
+    sh /tmp/library-scripts/provide-user.sh ${USERNAME} ${USER_UID} ${USER_GID} && \
+    dnf clean all && rm -rf /var/cache/dnf
+
+USER $USERNAME

.devcontainer/README.md

+# `ngx_http_voms_module` for developers
+
+A devcontainer is ready to use for the developers. A set of packages without nginx are already installed.
+
+## How to build and install nginx with or without httpg patch
+
+To build and install the latest stable version of [nginx](http://nginx.org/en/download.html) you have to copy the `nginx.repo` file (it is contained in the `docker` directory) into the `/etc/yum.repos.d/` directory and install nginx with `yum`:
+
+```shell
+$ sudo cp docker/nginx.repo /etc/yum.repos.d/
+$ sudo yum install -y nginx
+```
+
+Otherwise, if you want to build and install the latest stable version of [nginx](http://nginx.org/en/download.html) with the httpg patch, a bash library is ready to use. You can source it and follow the commands below:
+
+```shell
+$ source .devcontainer/assets/build-library.sh
+$ downloadNginx
+$ buildHttpgNginxRPM
+$ sudo rpm -ivh ~/rpmbuild/RPMS/x86_64/nginx-*.httpg.x86_64.rpm
+```
+
+## How to build and install the `ngx_http_voms_module`
+
+If you want to build and install the `ngx_http_voms_module`, nginx have to be installed in the container (see the previous section). When this requirement is satisfied, you can use the library contained in the `.devcontainer/assets` folder as follows (NOTE: if you have already download nginx source file, you can skip the relative command):
+
+```shell
+$ source .devcontainer/assets/build-library.sh
+$ downloadNginx
+$ buildVomsModuleRPM
+$ sudo rpm -ivh ~/rpmbuild/RPMS/x86_64/nginx-module-http-voms-*.x86_64.rpm
+```
+## How to manage this project
+
+If you want to understand how this project works, start from the CI. Three stages are defined:
+
+### 1. build-rpms
+
+Starting from a clear AlmaLinux 9, we install all the useful packages to compile nginx and to build a rpm package. The bash steps that achieves these results are defined in the `.devcontainer/assets/build-library.sh` file, so you can read that bash script to learn which nginx version we use, how to download it, how to set up the environment and how to build the rpm. 
+
+It is important to underline that to build the nginx rpm we use the spec file in the `rpm` repo, that is the official nginx 1.24.0 spec file increased by the HTTPG patch. To build the `ngx_http_voms_module` we have defined an appropriate spec file indeed. The files that are used to build the rpm module are written, called and collocated following the common practices of the nginx modules: a source file is defined in the `src` folder, the `config` and the `config.make` files are in the root project directory.
+
+At the end of this stage, all the useful rpms are saved as job artifacts.
+
+### 2. docker-build-rpms
+
+In this stage we set up a docker image with nginx, the httpg patch and the `ngx_http_voms_module`. To do this, we use a set of scripts in the [`helper-scripts`](https://baltig.infn.it/mw-devel/helper-scripts.git) project.
+
+The dockerfile and all the files needed for its compilation are in the `docker` directory. The image starts from AlmaLinux 9, defines a user and installs a set of useful packages. After that we import the nginx repo file, in this way we can download a lot of packages provided by nginx, including its last stable version. In the end we install the rpm packages that we build in the previous stage and the njs module.
+
+### 3. push-to-dockerhub
+
+In this last stage we push on dockerhub the image that we have builded in the previous stage. Note that this stage is run only when we push something in the master branch.

.devcontainer/assets/build-library.sh

+#!/usr/bin/env bash
+
+# Copyright 2018-2023 Istituto Nazionale di Fisica Nucleare
+# SPDX-License-Identifier: EUPL-1.2
+
+downloadNginx() {
+
+  # check if ~/rpmbuild exists and is not empty
+  if [ -d ${HOME}/rpmbuild ] && [ "$(ls -A ${HOME}/rpmbuild)" ]; then
+    >&2 echo "Error: ${HOME}/rpmbuild already exists and is not empty"
+    return 1
+  fi
+
+  # set nginx version
+  if [ -z ${ngxVersion} ]; then
+    ngxVersion=1.26.2-1
+  fi
+  elVersion=$(rpmbuild --eval %{rhel})
+  echo "Downloading nginx version ${ngxVersion} (EL${elVersion})"
+  src_package_name="nginx-${ngxVersion}.el${elVersion}.ngx.src.rpm"
+  src_package_url="https://nginx.org/packages/centos/${elVersion}/SRPMS/${src_package_name}"
+
+  wget ${src_package_url}
+  rpm -i ${src_package_name}
+
+}
+
+buildHttpgNginxRPM() {
+
+  if ! printenv CI_PROJECT_DIR > /dev/null; then
+    >&2 echo "CI_PROJECT_DIR is not set in the environment, assuming the current working directory '${PWD}'"
+    export CI_PROJECT_DIR="${PWD}"
+  fi
+
+  sh ${CI_PROJECT_DIR}/rpm/addPatchToNginxSpec.sh
+
+  # build rpm
+  rpmlint ~/rpmbuild/SPECS/nginx.spec
+  rpmbuild -ba ~/rpmbuild/SPECS/nginx.spec
+}
+
+buildVomsModuleRPM() {
+
+  if [ -z ${CI_PROJECT_DIR} ]; then
+    CI_PROJECT_DIR="/workspaces/ngx_http_voms_module"
+  fi
+
+  # set voms modules sources
+  cd ~/rpmbuild/SOURCES/
+  mkdir ngx-http-voms-module
+  cp ${CI_PROJECT_DIR}/config ngx-http-voms-module/
+  cp ${CI_PROJECT_DIR}/config.make ngx-http-voms-module/
+  cp -r ${CI_PROJECT_DIR}/src ngx-http-voms-module/
+  cp ${CI_PROJECT_DIR}/rpm/nginx-module-http-voms.spec ~/rpmbuild/SPECS
+
+  # build rpm
+  rpmlint ~/rpmbuild/SPECS/nginx-module-http-voms.spec
+  rpmbuild -ba ~/rpmbuild/SPECS/nginx-module-http-voms.spec
+
+  cd ${CI_PROJECT_DIR}
+
+}

.devcontainer/devcontainer.json

@@ -23,6 +23,6 @@
   // Use 'postCreateCommand' to run commands after the container is created.
   //"postCreateCommand": "sudo debuginfo-install -y voms",
   // Comment out this line to run as root instead.
-  "remoteUser": "build",
+  "remoteUser": "vscode",
   "remoteEnv": {"NGX_HTTP_VOMS_MODULE_ROOT": "${containerWorkspaceFolder}"}
 }
\ No newline at end of file

.devcontainer/library-scripts/provide-dev-deps.sh

+#!/usr/bin/env bash
+
+# Copyright 2018-2023 Istituto Nazionale di Fisica Nucleare
+# SPDX-License-Identifier: EUPL-1.2
+
+set -ex
+
+dnf install -y epel-release
+dnf update -y
+
+dnf install -y --setopt=tsflags=nodocs \
+    which \
+    wget \
+    sudo \
+    file \
+    git \
+    gcc-c++ \
+    gd-devel \
+    gettext \
+    ccache \
+    libxslt-devel \
+    lcov \
+    perl-ExtUtils-Embed \
+    perl-Digest-SHA \
+    readline-devel \
+    boost-devel \
+    voms-devel \
+    make \
+    patch \
+    zlib-devel \
+    pcre2-devel \
+    rpmdevtools \
+    rpmlint \
+    cpan \
+    voms-clients-cpp
\ No newline at end of file

.devcontainer/library-scripts/provide-user.sh

+#!/usr/bin/env bash
+
+# Copyright 2018-2023 Istituto Nazionale di Fisica Nucleare
+# SPDX-License-Identifier: EUPL-1.2
+
+USERNAME=${1}
+USER_UID=${2}
+USER_GID=${3}
+
+set -e
+
+if [ "$(id -u)" -ne 0 ]; then
+    echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
+    exit 1
+fi
+
+groupadd --gid $USER_GID $USERNAME
+useradd --uid $USER_UID --gid $USER_GID -m $USERNAME
+
+echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME
+chmod 0440 /etc/sudoers.d/$USERNAME
+
+CODESPACES_BASH="$(cat \
+<<'EOF'
+
+# Codespaces bash prompt theme
+__bash_prompt() {
+    local userpart='`export XIT=$? \
+        && [ ! -z "${GITHUB_USER}" ] && echo -n "\[\033[0;32m\]@${GITHUB_USER} " || echo -n "\[\033[0;32m\]\u " \
+        && [ "$XIT" -ne "0" ] && echo -n "\[\033[1;31m\]➜" || echo -n "\[\033[0m\]➜"`'
+    local gitbranch='`\
+        export BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null); \
+        if [ "${BRANCH}" = "HEAD" ]; then \
+            export BRANCH=$(git describe --contains --all HEAD 2>/dev/null); \
+        fi; \
+        if [ "${BRANCH}" != "" ]; then \
+            echo -n "\[\033[0;36m\](\[\033[1;31m\]${BRANCH}" \
+            && if git ls-files --error-unmatch -m --directory --no-empty-directory -o --exclude-standard ":/*" > /dev/null 2>&1; then \
+                    echo -n " \[\033[1;33m\]✗"; \
+            fi \
+            && echo -n "\[\033[0;36m\]) "; \
+        fi`'
+    local lightblue='\[\033[1;34m\]'
+    local removecolor='\[\033[0m\]'
+    PS1="${userpart} ${lightblue}\w ${gitbranch}${removecolor}\$ "
+    unset -f __bash_prompt
+}
+__bash_prompt
+
+EOF
+)"
+
+USER_RC_PATH="/home/${USERNAME}"
+echo "${CODESPACES_BASH}" >> "${USER_RC_PATH}/.bashrc"
+chown ${USERNAME}:${USER_GID} "${USER_RC_PATH}/.bashrc"
+
+echo "Done!"

.gitignore

 .vscode
 servroot*
-nginx
\ No newline at end of file
+nginx
+docker/artifacts
+node_modules
+t/*
+!t/README.md
+!t/*.t
+!t/setup.sh
+!t/conf.d
+!t/proxies.d
+!t/openssl.conf
+!t/socket.js
+

.gitlab-ci.yml

-image: ${CI_REGISTRY}/storm2/build/ngx-voms-build:issue-17-latest
-#image: storm2/ngx-voms-build:latest
 
 stages:
   - build
   - docker-build
   - docker-push
 
-build-rpm:
+build-rpms-el8:
   stage: build
-  script:
+  image: almalinux:8
+  script: 
+    - env | sort
+    - dnf -y install epel-release
+    - dnf install -y wget openssl-devel zlib-devel pcre2-devel make rpmdevtools rpmlint boost-devel voms-devel gcc-c++
+    - source .devcontainer/assets/build-library.sh
+    - CI_PROJECT_DIR=$PWD
+    - downloadNginx
+    - buildHttpgNginxRPM
+    - buildVomsModuleRPM
+    - cd ${CI_PROJECT_DIR}/docker && mkdir artifacts
+    - cp ~/rpmbuild/SRPMS/* artifacts/
+    - cp ~/rpmbuild/RPMS/x86_64/* artifacts/
+  artifacts:
+    paths:
+      - docker/artifacts/
+
+build-rpms-el9:
+  stage: build
+  image: almalinux:9
+  script: 
     - env | sort
-    - cd rpm && sh make_packaging.sh ${CI_PROJECT_DIR} && cd ..
-    - mv ${HOME}/rpmbuild ./rpmbuild
+    - dnf -y install epel-release
+    - dnf install -y wget openssl-devel zlib-devel pcre2-devel make rpmdevtools rpmlint boost-devel voms-devel gcc-c++
+    - source .devcontainer/assets/build-library.sh
+    - CI_PROJECT_DIR=$PWD
+    - downloadNginx
+    - buildHttpgNginxRPM
+    - buildVomsModuleRPM
+    - cd ${CI_PROJECT_DIR}/docker && mkdir artifacts
+    - cp ~/rpmbuild/SRPMS/* artifacts/
+    - cp ~/rpmbuild/RPMS/x86_64/* artifacts/
   artifacts:
     paths:
-      - rpmbuild/SRPMS/
-      - rpmbuild/RPMS/noarch/
-      - rpmbuild/RPMS/x86_64/
+      - docker/artifacts/
 
-docker-build-rpm:
+docker-build-rpms:
   stage: docker-build
   image: docker:latest
   services:
     - name: docker:dind
       command: ["--tls=false"]
   dependencies:
-    - build-rpm
+    - build-rpms-el8
+    - build-rpms-el9
   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
-    - cp rpmbuild/RPMS/x86_64/* ${CI_PROJECT_DIR}/docker/openresty-voms/
-    - cp rpmbuild/RPMS/noarch/* ${CI_PROJECT_DIR}/docker/openresty-voms/ 
-    - rm ${CI_PROJECT_DIR}/docker/openresty-voms/*-debuginfo*.rpm
+    - 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/openresty-voms && build-docker-image.sh && push-docker-image.sh
+    - cd docker && build-docker-image.sh && push-docker-image.sh
 
 push-to-dockerhub:
   stage: docker-push
@@ -45,7 +68,7 @@ push-to-dockerhub:
     - name: docker:dind
       command: ["--tls=false"]
   dependencies:
-    - docker-build-rpm
+    - docker-build-rpms
   script:
     - apk add git bash
     - git clone https://baltig.infn.it/mw-devel/helper-scripts.git helper-scripts
@@ -55,7 +78,7 @@ push-to-dockerhub:
     - 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/openresty-voms && pull-docker-image.sh && unset DOCKER_REGISTRY_HOST
+    - cd docker && pull-docker-image.sh && unset DOCKER_REGISTRY_HOST
     - docker login -u ${DOCKERHUB_USER} -p ${DOCKERHUB_PASSWORD} && push-docker-image.sh
   only:
     - master

README.md

-# ngx_http_voms_module
+# `ngx_http_voms_module`
 
-[![pipeline status](https://baltig.infn.it/storm2/ngx_http_voms_module/badges/master/pipeline.svg)](https://baltig.infn.it/storm2/ngx_http_voms_module/commits/master)
+[![pipeline status](https://baltig.infn.it/cnafsd/ngx_http_voms_module/badges/master/pipeline.svg)](https://baltig.infn.it/cnafsd/ngx_http_voms_module/commits/master)
 
 ## Description
 
-*ngx_http_voms_module* is a module for the [Nginx web server](https://www.nginx.org/) that enables client-side authentication based on X.509 proxy certificates augmented with VOMS Attribute Certificates, typically obtained from a [Virtual Organization Membership Service](https://italiangrid.github.io/voms/) (VOMS) server.
+`ngx_http_voms_module` is a module for the [Nginx web server](https://www.nginx.org/) that enables client-side authentication based on X.509 proxy certificates augmented with VOMS Attribute Certificates, typically obtained from a [Virtual Organization Membership Service](https://italiangrid.github.io/voms/) (VOMS) server.
 
-The module defines a set of [*embedded* variables](#embedded-variables), whose values are extracted from the first Attribute Certificate found in the certificate chain.
+The module defines a set of *embedded* variables, whose values are extracted from the first Attribute Certificate found in the certificate chain.
 
-## Installation
-
-The generic installation instructions are:
-
-```shell
-$ cd nginx-x.y.z
-$ ./configure --add-module=/path/to/ngx_http_voms_module
-$ make && make install
-```
-
-The module is written in C++, using features from C++14 that are supported by gcc v. 4.8.5 (the version available in CentOS 7) enabling the option `-std=c++1y` (see [`config.make`](config.make)).
-
-A Docker image is available for use in the context of the StoRM2 project, where the OpenResty distribution is used:
-
-```shell
-$ docker run --rm -it -v /path/to/ngx_http_voms_module:/home/build/ngx_http_voms_module storm2/ngx-voms-build
-$ cd openresty-x.y.z
-$ ./configure ${RESTY_CONFIG_OPTIONS} --add-module=../ngx_http_voms_module
-$ make && make install
-```
-
-## Embedded Variables
+### Embedded Variables
 
 The module makes the following embedded variables available for use in an Nginx configuration file:
 
-### voms_user
+#### voms_user
 
 The Subject of the End-Entity certificate, used to sign the proxy.
 
 _Example_: ``/C=IT/O=IGI/CN=test0``
 
-### ssl_client_ee_s_dn
+#### ssl_client_ee_s_dn
 
 Like `voms_user`, the Subject of the End-Entity certificate. Unlike `voms_user`, it is available even for non-VOMS proxies and is formatted according to RFC 2253.
 
 _Example_: `CN=test0,O=IGI,C=IT`
 
-### voms_user_ca
+#### voms_user_ca
 
 The Issuer (Certificate Authority) of the End-Entity certificate.
 
 _Example_: `/C=IT/O=IGI/CN=Test CA`
 
-### ssl_client_ee_i_dn
+#### ssl_client_ee_i_dn
 
 Like `voms_user_ca`, the Issuer of the End-Entity certificate. Unlike `voms_user_ca`, it is available even for non-VOMS proxies and is formatted according to RFC 2253.
 
 _Example_: `CN=Test CA,O=IGI,C=IT`
 
-### voms_fqans
+#### voms_fqans
 
 A comma-separated list of Fully Qualified Attribute Names. See [The VOMS Attribute Certificate Format](http://ogf.org/documents/GFD.182.pdf) for more details.
 
 _Example_: `/test.vo/exp1,/test.vo/exp2,/test.vo/exp3/Role=PIPPO`
 
-### voms_server
+#### voms_server
 
 The Subject of the VOMS server certificate, used to sign the Attribute Certificate.
 
 _Example_: `/C=IT/O=IGI/CN=voms.example`
 
-### voms_server_ca
+#### voms_server_ca
 
 The Issuer (Certificate Authority) of the VOMS server certificate.
 
 _Example_: `/C=IT/O=IGI/CN=Test CA`
 
-### voms_vo
+#### voms_vo
 
 The name of the Virtual Organization (VO) to which the End Entity belongs.
 
 _Example_: `test.vo`
 
-### voms_server_uri
+#### voms_server_uri
 
 The hostname and port of the VOMS network service that issued the Attribute Certificate, in the form _hostname_ :_port_.
 
 _Example_: `voms.example:15000`
 
-### voms_not_before
+#### voms_not_before
 
 The date before which the Attribute Certificate is not yet valid, in the form _YYYYMMDDhhmmss_ `Z`.
 
 _Example_: `20180101000000Z`
 
-### voms_not_after
+#### voms_not_after
 
 The date after which the Attribute Certificate is not valid anymore, in the form _YYYYMMDDhhmmss_ `Z`.
 
 _Example_: `20180101120000Z`
 
-### voms_generic_attributes
+#### voms_generic_attributes
 
 A comma-separated list of attributes, each defined by three properties and formatted as `n=`_name_ `v=`_value_ `q=`_qualifier_. The qualifier typically coincides with the name of the VO.
 
 _Example_: `n=nickname v=newland q=test.vo,n=nickname v=giaco q=test.vo`
 
-### voms_serial
+#### voms_serial
 
 The serial number of the Attribute Certificate in hexadecimal format.
 
 _Example_: `7B`
 
+## Installation
+
+### prerequisites
+The software dependecies are listed in the [provide-deps](docker/library-scripts/provide-deps.sh) script in the `docker` directory.
+
+The nginx source files are also needed. To download them in ```/tmp/nginx-x.y.z``` you can execute:
+
+```shell
+$ ngxVersion=<version>
+$ wget -O /tmp/nginx-$ngxVersion.tar.gz https://nginx.org/download/nginx-$ngxVersion.tar.gz
+$ cd /tmp && tar -xzvf /tmp/nginx-$ngxVersion.tar.gz && cd -
+```
+
+### Generic installation
+The generic installation instructions are:
+
+```shell
+$ cd /tmp/nginx-x.y.z
+$ ./configure --add-module=/path/to/ngx_http_voms_module
+$ make && make install
+```
+
+### Docker container
+
+A Docker image with nginx and the `ngx_http_voms_module` is available, you can find it [here](https://hub.docker.com/r/cnafsd/nginx-httpg-voms).
+
+### For the developers
+A [.devcontainer](.devcontainer) is provided for the developers with all the instructions on how to use it, how to build the rpm module and how to install it.
+
 ## Testing
 
-Setup and files to test the *ngx_http_voms_module* are contained in the [`t`](t) folder.
+Setup and files to test the `ngx_http_voms_module` are contained in the [`t`](t) folder.

config

+ngx_addon_name=ngx_http_voms_module
 ngx_module_type=HTTP
-ngx_addon_name=voms
 ngx_module_name=ngx_http_voms_module
 ngx_module_srcs="$ngx_addon_dir/src/ngx_http_voms_module.cpp"
 ngx_module_libs="-lvomsapi -lstdc++"

config.make

-echo "objs/addon/src/ngx_http_voms_module.o: CFLAGS += --std=c++1y -Werror" >> $NGX_MAKEFILE
+echo "objs/addon/src/ngx_http_voms_module.o: CFLAGS += -Werror" >> $NGX_MAKEFILE
 

cov-ngx-voms.sh

-#!/bin/sh
-
-# Copyright 2018 Istituto Nazionale di Fisica Nucleare
-#
-# Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the
-# European Commission - subsequent versions of the EUPL (the "Licence"). You may
-# not use this work except in compliance with the Licence. You may obtain a copy
-# of the Licence at:
-#
-# https://joinup.ec.europa.eu/software/page/eupl
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Licence is distributed on an "AS IS" basis, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# Licence for the specific language governing permissions and limitations under
-# the Licence.
-
-# This script builds in debug mode and installs openresty together with the
-# ngx_http_voms_module.
-#
-# The script requires the locations of the openresty bundle and of the
-# ngx_http_voms_module code (for example as checked-out from git). The locations
-# are expressed by the environment variables OPENRESTY_ROOT and
-# NGX_HTTP_VOMS_MODULE_ROOT respectively, if available. If they are not set,
-# they are guessed:
-# * a unique openresty bundle is looked for in ${HOME}
-# * the ngx_http_voms_module code is looked for in the working directory of the
-#   continuous integration environment first and then in ${HOME}
-#
-# The script works best (i.e. it is tested) if run within a docker container
-# started from the storm2/ngx-voms-build image.
-
-#geninfo --base-directory ${HOME}/openresty-1.13.6.1/build/nginx-1.13.6/objs/addon/src/ --output-filename coverage.info ${HOME}/openresty-1.13.6.1/build/nginx-1.13.6/objs/addon/src/
-geninfo --output-filename /tmp/coverage.info ${HOME}/openresty-1.15.8.1/build/nginx-1.15.8/objs/addon/src/
-genhtml --prefix ${HOME}/openresty-1.15.8.1/build/nginx-1.15.8/objs/addon/src/ --ignore-errors source --demangle-cpp /tmp/coverage.info \
-  --legend --title "coverage ngix" --output-directory=/tmp/coverage-report
-
-exit_status=$?
-if [ ! $exit_status -eq 0 ]; then
-   echo "check output"
-fi
-echo $exit_status
-

docker/openresty-voms/.env → docker/.env

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

docker/Dockerfile

+# Copyright 2018-2023 Istituto Nazionale di Fisica Nucleare
+# SPDX-License-Identifier: EUPL-1.2
+
+ARG EL_VERSION=9
+
+FROM almalinux:${EL_VERSION}
+
+# https://docs.docker.com/reference/dockerfile/#understand-how-arg-and-from-interact
+ARG EL_VERSION
+
+# Allow customization of nginx user ID and name
+ARG USERNAME=nginx
+ARG USER_UID=1000
+ARG USER_GID=${USER_UID}
+
+# install dependencies
+COPY library-scripts/*.sh /tmp/library-scripts/
+RUN dnf update -y && \
+    sh /tmp/library-scripts/provide-deps.sh && \
+    sh /tmp/library-scripts/provide-user.sh ${USERNAME} ${USER_UID} ${USER_GID} && \
+    mkdir /pkgs && \
+    dnf clean all && rm -rf /var/cache/dnf
+
+COPY artifacts/*.rpm /pkgs/
+
+# install nginx httpg + voms and njs dynamic modules (latest version)
+COPY nginx.repo /etc/yum.repos.d/nginx.repo
+RUN rpm -ivh /pkgs/nginx-*.el${EL_VERSION}.httpg.x86_64.rpm && \
+    rpm -ivh /pkgs/nginx-module-http-voms-*.el${EL_VERSION}.x86_64.rpm && \
+    dnf install -y nginx-module-njs \
+# forward request and error logs to docker log collector
+    && ln -sf /dev/stdout /var/log/nginx/access.log \
+    && ln -sf /dev/stderr /var/log/nginx/error.log
+
+# install nginx + voms and njs dynamic modules
+# RUN dnf -y install nginx nginx-module-njs && \
+#     rpm -ivh /pkgs/nginx-module-http-voms-1.24.0-1.el${EL_VERSION}.x86_64.rpm
+
+EXPOSE 80
+
+STOPSIGNAL SIGQUIT
+
+CMD ["nginx", "-g", "daemon off;"]

docker/README.md

-This folder contains the ngx-module-packaging folder that contains a Dockerfile to build Openresty/NGINX voms rpm.
-
-For more details see the [Dockerfile](./ngx-module-packaging/Dockerfile).
-
-

docker/library-scripts/provide-deps.sh

+#!/usr/bin/env bash
+
+# Copyright 2018-2023 Istituto Nazionale di Fisica Nucleare
+# SPDX-License-Identifier: EUPL-1.2
+
+set -ex
+
+dnf -y install epel-release wget
+
+# https://openresty.org/en/linux-packages.html#centos
+wget https://openresty.org/package/centos/openresty2.repo
+mv openresty2.repo /etc/yum.repos.d/openresty.repo
+
+dnf config-manager --set-enabled crb
+dnf -y install \
+    hostname \
+    which \
+    tar \
+    sudo \
+    file \
+    readline \
+    gettext \
+    less \
+    openssl \
+    zlib-devel \
+    pcre2-devel \
+    boost-devel \
+    voms-devel \
+    patch \
+    gcc-c++ \
+    rpmdevtools \
+    rpmlint \
+    perl-ExtUtils-Embed \
+    perl-Test-Nginx \
+    perl-Digest-SHA \
+    cpan \
+    voms-clients-cpp \
+    procps-ng

docker/library-scripts/provide-user.sh

+#!/usr/bin/env bash
+
+# Copyright 2018-2023 Istituto Nazionale di Fisica Nucleare
+# SPDX-License-Identifier: EUPL-1.2
+
+USERNAME=${1}
+USER_UID=${2}
+USER_GID=${3}
+
+set -ex
+
+groupadd --gid $USER_GID $USERNAME
+useradd --uid $USER_UID --gid $USER_GID -m $USERNAME
+
+echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME
+chmod 0440 /etc/sudoers.d/$USERNAME

docker/nginx.repo

+[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

docker/openresty-voms/Dockerfile

-FROM centos:7
-
-# Allow customization of nginx user ID and name
-ARG NGINX_USER=nginx
-ARG NGINX_USER_UID=1001
-
-ENV NGINX_USER $NGINX_USER
-ENV NGINX_USER_UID $NGINX_USER_UID
-
-RUN echo "include_only=.garr.it,.cern.ch" >> /etc/yum/pluginconf.d/fastestmirror.conf && \
-      yum clean all && \
-      yum install -y hostname epel-release && \
-      yum -y update && \
-      yum -y install which wget tar sudo file && \
-      echo '%wheel ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers && \
-      adduser --uid ${NGINX_USER_UID} ${NGINX_USER} && \
-      usermod -a -G root ${NGINX_USER} && \
-      yum clean all && \
-      rm -rf /var/cache/yum
-
-RUN  \
-          yum -y install voms zlib pcre readline gettext && \ 
-          mkdir /pkgs
-
-ADD *.rpm /pkgs/
-
-RUN yum -y localinstall /pkgs/*.rpm && \
-      chmod -R g+rwx /usr/local/openresty-voms/nginx && \
-      mkdir -p /etc/nginx/conf.d
-
-ADD assets/nginx.conf /usr/local/openresty-voms/nginx/conf/nginx.conf
-
-CMD ["/usr/bin/openresty-voms", "-g", "daemon off;"]
-
-ENV TINI_VERSION v0.18.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
-ENTRYPOINT ["/tini", "--"]

docker/openresty-voms/assets/nginx.conf

-user  nobody;
-worker_processes  1;
-
-env OPENSSL_ALLOW_PROXY_CERTS=1;
-env X509_VOMS_DIR=/vomsdir;
-
-error_log  logs/error.log  notice;
-
-pid        logs/nginx.pid;
-
-events {
-    worker_connections  1024;
-}
-
-
-http {
-    include       mime.types;
-    default_type  application/octet-stream;
-
-    log_format tls '$time_iso8601 [$request_id] $remote_addr - $remote_user "$request" <$upstream_response_time> '
-                    '$ssl_protocol/$ssl_cipher '
-                    '"$ssl_client_s_dn" '
-                    '[$voms_fqans] '
-                    '$status $body_bytes_sent "$http_referer" '
-                    '"$http_user_agent" "$http_x_forwarded_for"';
-
-    log_format  plain '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  logs/access.log  tls;
-
-    sendfile        on;
-    #tcp_nopush     on;
-
-    keepalive_timeout  65;
-
-    #gzip  on;
-    
-    include /etc/nginx/conf.d/*.conf;
-
-}