diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 02dcee1..a329e41 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -176,7 +176,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -302,7 +302,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -428,7 +428,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -552,7 +552,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -674,7 +674,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -796,7 +796,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -919,7 +919,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -1042,7 +1042,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -1165,7 +1165,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -1288,7 +1288,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -1411,7 +1411,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -1534,7 +1534,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -1657,7 +1657,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -1780,7 +1780,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -1902,7 +1902,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -2024,7 +2024,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -2146,7 +2146,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -2268,7 +2268,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 7e661cf..2067b34 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -46,7 +46,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -172,7 +172,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -298,7 +298,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -422,7 +422,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -549,7 +549,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -672,7 +672,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -794,7 +794,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -916,7 +916,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -1039,7 +1039,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -1162,7 +1162,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -1285,7 +1285,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -1408,7 +1408,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -1531,7 +1531,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -1654,7 +1654,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -1777,7 +1777,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -1900,7 +1900,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -2022,7 +2022,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -2144,7 +2144,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -2266,7 +2266,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then @@ -2388,7 +2388,7 @@ jobs: fi if [[ "${GITHUB_REF}" == refs/tags/* ]]; then - git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" fi if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bf1380..6b24264 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 6.5.2 2024-09-25 + + ### Changed + - Pin to base image 7.10.14 + + ## 6.5.1 2024-09-24 ### Added diff --git a/Dockerfile b/Dockerfile index 857470b..d2b9a26 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG DISTRO=alpine ARG DISTRO_VARIANT=3.20 -FROM docker.io/tiredofit/${DISTRO}:${DISTRO_VARIANT} +FROM docker.io/tiredofit/${DISTRO}:${DISTRO_VARIANT}-7.10.14 LABEL maintainer="Dave Conroy (github.com/tiredofit)" ARG NGINX_VERSION @@ -81,11 +81,10 @@ RUN case "$(cat /etc/os-release | grep VERSION_ID | cut -d = -f 2 | cut -d . -f --http-scgi-temp-path=/var/cache/nginx/scgi_temp \ --user=${NGINX_USER} \ --group=${NGINX_GROUP} \ + --add-module=${GIT_REPO_SRC_HEADERS_MORE_NGINX_MODULE} \ --add-module=${GIT_REPO_SRC_NGINX_AUTH_LDAP} \ - --add-module=${GIT_REPO_SRC_NGX_BROTLI} \ --add-module=${GIT_REPO_SRC_NGINX_COOKIE_FLAG_MODULE} \ - --add-module=${GIT_REPO_SRC_HEADERS_MORE_NGINX_MODULE} \ - ## GCC 11.2 fix https://github.com/google/ngx_brotli/issues/124 + --add-module=${GIT_REPO_SRC_NGX_BROTLI} \ --with-cc-opt='-Wno-vla-parameter' \ --with-compat \ --with-file-aio \