Add support for module versions on el8 #1

Author: jfut

.github/workflows/release.yaml

@@ -28,20 +28,21 @@ jobs:
       matrix:
         image:
           - centos-7
-          - centos-8
+          - centos-8-1.16
+          - centos-8-mainline
 
     env:
       BUILD_IMAGE: ${{ matrix.image }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
         with:
           fetch-depth: 1
       - name: Build RPM
         id: build_rpm
         run: |
-          ./build $(echo ${BUILD_IMAGE} | sed 's/-/:/')
+          ./build $(echo ${BUILD_IMAGE} | sed 's/-/:/g')
           echo "##[set-output name=release-tag;]$(echo ${{ github.ref }} | sed -e 's|refs/tags/||g')"
       - name: Upload Assets
         uses: AButler/[email protected]

.github/workflows/test.yaml

@@ -13,23 +13,24 @@ jobs:
       matrix:
         image:
           - centos-7
-          - centos-8
+          - centos-8-1.16
+          - centos-8-mainline
 
     env:
       BUILD_IMAGE: ${{ matrix.image }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
         with:
           fetch-depth: 1
       - name: Build RPM
         id: build_rpm
         run: |
-          ./build $(echo ${BUILD_IMAGE} | sed 's/-/:/')
+          ./build $(echo ${BUILD_IMAGE} | sed 's/-/:/g')
       - name: Upload artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v2
         with:
           name: ${{ matrix.image }}
-          path: rpmbuild/RPMS/x86_64
+          path: rpmbuild/**/*.rpm
 

README.md

@@ -7,7 +7,19 @@ RPM Packaging for [ngx-fancyindex](https://github.com/aperezdc/ngx-fancyindex).
 ## Install an RPM package
 
 - [Download](https://github.com/jfut/nginx-module-fancyindex-rpm/releases)
-- `yum install nginx-module-fancyindex-x.y.z-n.elx.x86_64.rpm`
+- Install:
+
+```
+# el7
+yum install nginx-module-fancyindex-0.4.4-2.el7.x86_64.rpm
+
+# el8 + module 1.16 stream
+dnf install nginx-module-fancyindex-0.4.4-2.module_el8.1.16.x86_64.rpm
+
+# el8 + EPEL module mainline stream
+dnf install nginx-module-fancyindex-0.4.4-2.module_el8.mainline.x86_64.rpm
+```
+
 - Add `load_module` in `nginx.conf`:
     ```
     load_module "modules/ngx_http_fancyindex_module.so";
@@ -19,16 +31,20 @@ RPM Packaging for [ngx-fancyindex](https://github.com/aperezdc/ngx-fancyindex).
 
 ```
 Usage:
-    build [-d] [-h] BUILD_IMAGE_NAME
+    build [-d] [-h] BUILD_IMAGE_NAME:BUILD_IMAGE_TAG[:MODULE_VERSION]
 
     Options:
         -d Debug mode.
 
-    Build for CentOS 8:
-        build -i centos:8
+    Build for CentOS 8 + AppStream module:
+        # build centos:8:1.14 1.14 (not supported)
+        build centos:8:1.16
+
+    Build for CentOS 8 + EPEL Stream module:
+        build centos:8:mainline
 
     Build for CentOS 7:
-        build -i centos:7
+        build centos:7
 ```
 
 ## Build RPM Packages with Docker
@@ -43,16 +59,16 @@ You can build RPM packages in Docker.
 
 ```
 ./build -d
-/pkg/build-rpm /pkg/rpmbuild nginx-module-fancyindex.spec
+/pkg/build-rpm /pkg/rpmbuild nginx-module-fancyindex.spec 1.6
 ```
 
 ## Release tag
 
 e.g.:
 
 ```
-git tag -a v1.5.1-1 -m "v1.5.1-1"
-git push origin refs/tags/v1.5.1-1
+git tag -a v0.4.4-2 -m "v0.4.4-2"
+git push origin refs/tags/v0.4.4-2
 ```
 
 ## License

build

@@ -2,6 +2,8 @@
 #
 # Build RPM  with docker
 
+set -e
+set -u
 
 DOCKER_RPMBUILD_DIR="/pkg/rpmbuild"
 SPEC_FILE_NAME="nginx-module-fancyindex.spec"
@@ -11,17 +13,23 @@ HOST_RPMBUILD_DIR="${SCRIPT_DIR}/rpmbuild"
 
 PACKAGER="$(basename "${0}")"
 
+DEBUG="no"
+
 # Usage
 usage() {
     cat << _EOF_
 Usage:
-    ${PACKAGER} [-d] [-h] BUILD_IMAGE_NAME
+    ${PACKAGER} [-d] [-h] BUILD_IMAGE_NAME:BUILD_IMAGE_TAG[:MODULE_VERSION]
 
     Options:
         -d Debug mode.
 
-    Build for CentOS 8:
-        ${PACKAGER} centos:8
+    Build for CentOS 8 + AppStream module:
+	# ${PACKAGER} centos:8:1.14 1.14 (not supported)
+        ${PACKAGER} centos:8:1.16
+
+    Build for CentOS 8 + EPEL Stream module:
+        ${PACKAGER} centos:8:mainline
 
     Build for CentOS 7:
         ${PACKAGER} centos:7
@@ -40,13 +48,19 @@ setup_dir() {
 }
 
 build() {
-    local BUILD_IMAGE="$1"
+    local BUILD_ARGS="$1"
+
+    local BUILD_IMAGE_NAME=$(echo ${BUILD_ARGS} | cut -d':' -f 1)
+    local BUILD_IMAGE_TAG=$(echo ${BUILD_ARGS} | cut -d':' -f 2)
+    local MODULE_VERSION=$(echo ${BUILD_ARGS} | cut -d':' -f 3)
 
-    local BUILD_HOSTNAME="rpmbuild.$(echo ${BUILD_IMAGE} | tr -d ':').docker"
+    local BUILD_IMAGE="${BUILD_IMAGE_NAME}:${BUILD_IMAGE_TAG}" 
+    local BUILD_HOSTNAME="rpmbuild.${BUILD_IMAGE_NAME}${BUILD_IMAGE_TAG}.docker"
 
     local DOCKER_OPTIONS=""
-    local BUILD_CMD="$(dirname ${DOCKER_RPMBUILD_DIR})/build-rpm ${DOCKER_RPMBUILD_DIR} ${SPEC_FILE_NAME}"
+    local BUILD_CMD="$(dirname ${DOCKER_RPMBUILD_DIR})/build-rpm ${DOCKER_RPMBUILD_DIR} ${SPEC_FILE_NAME} ${MODULE_VERSION}"
     if [[ "${DEBUG}" = "yes" ]]; then
+        echo "# Manual Build: ${BUILD_CMD}"
         DOCKER_OPTIONS="-it"
         BUILD_CMD="/bin/bash"
     fi

build-rpm

@@ -4,18 +4,22 @@
 #
 # @author Jun Futagawa
 
+set -e
+set -u
+
+export LC_ALL=C
+
 BUILD_PACKAGES="autoconf automake libtool gcc make rpm-build rpmdevtools"
 MAX_RETRY="10"
 
 if [[ $# -lt 2 ]]; then
-    echo $0 RPMBUILD_DIR SPEC_FILE_NAME
+    echo $0 RPMBUILD_DIR SPEC_FILE_NAME [MODULE_VERSION]
     exit 1
 fi
 
-RPMBUILD_DIR="$1"
-SPEC_FILE_NAME="$2"
-
-export LC_ALL=C
+RPMBUILD_DIR="${1}"
+SPEC_FILE_NAME="${2}"
+MODULE_VERSION="${3:-}"
 
 pushd "${RPMBUILD_DIR}"
 
@@ -28,10 +32,15 @@ if [[ -f /usr/bin/dnf ]]; then
     PACKAGE_MANAGER="dnf"
     dnf -y install epel-release
     dnf clean all
+    # check module version
+    if [[ -z "${MODULE_VERSION}" ]]; then
+        echo "Error: MODULE_VERSION is required for el8 or later"
+        exit 1
+    fi
     echo
-    echo "Installing nginx:mainline/common"
     dnf -y module reset nginx
-    dnf -y module install nginx:mainline/common
+    echo "Installing nginx:${MODULE_VERSION}"
+    dnf -y module install nginx:${MODULE_VERSION}/common
 else
     PACKAGE_MANAGER="yum"
     yum -y install epel-release
@@ -82,6 +91,9 @@ spectool -g -A "SPECS/${SPEC_FILE_NAME}" -C SOURCES/
 
 echo "Building RPM:"
 RPM_DIST=$(egrep "\%dist" /etc/rpm/macros.dist | awk '{ print $2 }' | sed -E 's|^(\..*)\..*|\1|')
+if [[ ! -z "${MODULE_VERSION}" ]]; then
+    RPM_DIST=$(echo "${RPM_DIST}" | sed -r "s/^\.(.*)/.module_\1.${MODULE_VERSION}/")
+fi
 rpmbuild \
     --define "%_topdir ${RPMBUILD_DIR}" \
     --define "%dist ${RPM_DIST}" \

rpmbuild/SPECS/nginx-module-fancyindex.spec.in

@@ -6,7 +6,7 @@
 Summary: Nginx module to use PAM for simple http authentication
 Name: nginx-module-fancyindex
 Version: 0.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD-2-Clause
 URL: https://github.com/sto/ngx_http_fancyindex_module
 
@@ -58,5 +58,8 @@ make modules
 %doc CHANGELOG.md HACKING.md LICENSE README.rst
 
 %changelog
+* Sat Sep 19 2020 Jun Futagawa <[email protected]> 0.4.4-2
+- Add support for module versions on el8 #1
+
 * Sun Apr 19 2020 Jun Futagawa <[email protected]> 0.4.4-1
 - Initial release