diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 04b17e5..298b21b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,61 +13,23 @@ jobs: - name: Checkout code uses: actions/checkout@v6 - - name: Extract version variables - id: versions - run: | - NGINX_VERSION=$(grep '^NGINX_VERSION=' bin/compile | cut -d'"' -f2) - PCRE_VERSION=$(grep '^PCRE_VERSION=' bin/compile | cut -d'"' -f2) - ZLIB_VERSION=$(grep '^ZLIB_VERSION=' bin/compile | cut -d'"' -f2) - echo "NGINX_VERSION=$NGINX_VERSION" >> "$GITHUB_OUTPUT" - echo "PCRE_VERSION=$PCRE_VERSION" >> "$GITHUB_OUTPUT" - echo "ZLIB_VERSION=$ZLIB_VERSION" >> "$GITHUB_OUTPUT" - - name: Download source tarballs run: | + source "$GITHUB_WORKSPACE/conf/nginx-configure-flags" cd /tmp - curl -sSL "https://nginx.org/download/nginx-${{ steps.versions.outputs.NGINX_VERSION }}.tar.gz" | tar xz - curl -sSL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${{ steps.versions.outputs.PCRE_VERSION }}/pcre2-${{ steps.versions.outputs.PCRE_VERSION }}.tar.gz" | tar xz - curl -sSL "https://github.com/madler/zlib/archive/v${{ steps.versions.outputs.ZLIB_VERSION }}.tar.gz" | tar xz + curl -sSL "https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz" | tar xz + curl -sSL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PCRE_VERSION}/pcre2-${PCRE_VERSION}.tar.gz" | tar xz + curl -sSL "https://github.com/madler/zlib/archive/v${ZLIB_VERSION}.tar.gz" | tar xz - name: Compile nginx run: | - cd /tmp/nginx-${{ steps.versions.outputs.NGINX_VERSION }} + source "$GITHUB_WORKSPACE/conf/nginx-configure-flags" + cd /tmp/nginx-${NGINX_VERSION} ./configure \ - --with-cpu-opt=generic \ --prefix=/tmp/nginx-build \ - --with-pcre=../pcre2-${{ steps.versions.outputs.PCRE_VERSION }} \ - --sbin-path=. \ - --pid-path=./nginx.pid \ - --conf-path=./nginx.conf \ - --with-ld-opt="-static" \ - --with-http_stub_status_module \ - --with-http_gzip_static_module \ - --with-file-aio \ - --with-zlib=../zlib-${{ steps.versions.outputs.ZLIB_VERSION }} \ - --with-pcre \ - --with-cc-opt="-O2 -static -static-libgcc" \ - --without-http_ssi_module \ - --without-http_userid_module \ - --without-http_access_module \ - --without-http_autoindex_module \ - --without-http_geo_module \ - --without-http_map_module \ - --without-http_split_clients_module \ - --without-http_referer_module \ - --without-http_fastcgi_module \ - --without-http_uwsgi_module \ - --without-http_scgi_module \ - --without-http_memcached_module \ - --without-http_empty_gif_module \ - --without-http_browser_module \ - --without-http_upstream_ip_hash_module \ - --without-http_upstream_least_conn_module \ - --without-http_upstream_keepalive_module \ - --without-mail_pop3_module \ - --without-mail_imap_module \ - --without-mail_smtp_module \ - --with-http_realip_module + --with-pcre=../pcre2-${PCRE_VERSION} \ + --with-zlib=../zlib-${ZLIB_VERSION} \ + "${NGINX_CONFIGURE_FLAGS[@]}" sed -i "/CFLAGS/s/ \-O //g" objs/Makefile make -j"$(nproc)" cp objs/nginx /tmp/nginx-linux-amd64 diff --git a/bin/compile b/bin/compile index 88a1c35..9ef819c 100755 --- a/bin/compile +++ b/bin/compile @@ -3,16 +3,10 @@ set -eo pipefail [[ $TRACE ]] && set -x -# https://nginx.org/en/download.html -NGINX_VERSION="1.29.8" +# shellcheck source=conf/nginx-configure-flags +source "$(cd "$(dirname "$0")" && cd .. && pwd)/conf/nginx-configure-flags" NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz" -# https://github.com/PCRE2Project/pcre2/releases -PCRE_VERSION="10.47" PCRE_TARBALL="pcre2-${PCRE_VERSION}.tar.gz" -# https://github.com/gliderlabs/sigil/releases -SIGIL_VERSION="0.11.5" -# https://github.com/madler/zlib/releases -ZLIB_VERSION="1.3.2" ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz" BUILDPACK_REPO="dokku/heroku-buildpack-nginx" @@ -103,40 +97,10 @@ else echo "-----> Compiling static nginx binary" mkdir "$BUILD_DIR/nginx" suppress ./configure \ - --with-cpu-opt=generic \ --prefix="$BUILD_DIR/nginx" \ --with-pcre=../pcre2-${PCRE_VERSION} \ - --sbin-path=. \ - --pid-path=./nginx.pid \ - --conf-path=./nginx.conf \ - --with-ld-opt="-static" \ - --with-http_stub_status_module \ - --with-http_gzip_static_module \ - --with-file-aio \ --with-zlib=../zlib-${ZLIB_VERSION} \ - --with-pcre \ - --with-cc-opt="-O2 -static -static-libgcc" \ - --without-http_ssi_module \ - --without-http_userid_module \ - --without-http_access_module \ - --without-http_autoindex_module \ - --without-http_geo_module \ - --without-http_map_module \ - --without-http_split_clients_module \ - --without-http_referer_module \ - --without-http_fastcgi_module \ - --without-http_uwsgi_module \ - --without-http_scgi_module \ - --without-http_memcached_module \ - --without-http_empty_gif_module \ - --without-http_browser_module \ - --without-http_upstream_ip_hash_module \ - --without-http_upstream_least_conn_module \ - --without-http_upstream_keepalive_module \ - --without-mail_pop3_module \ - --without-mail_imap_module \ - --without-mail_smtp_module \ - --with-http_realip_module + "${NGINX_CONFIGURE_FLAGS[@]}" sed -i "/CFLAGS/s/ \-O //g" objs/Makefile diff --git a/conf/nginx-configure-flags b/conf/nginx-configure-flags new file mode 100644 index 0000000..9adb41e --- /dev/null +++ b/conf/nginx-configure-flags @@ -0,0 +1,47 @@ +#!/usr/bin/env bash +# Shared nginx build configuration +# Sourced by bin/compile and .github/workflows/release.yml +# shellcheck disable=SC2034 + +# https://nginx.org/en/download.html +NGINX_VERSION="1.29.8" +# https://github.com/PCRE2Project/pcre2/releases +PCRE_VERSION="10.47" +# https://github.com/gliderlabs/sigil/releases +SIGIL_VERSION="0.11.5" +# https://github.com/madler/zlib/releases +ZLIB_VERSION="1.3.2" + +NGINX_CONFIGURE_FLAGS=( + --with-cpu-opt=generic + --sbin-path=. + --pid-path=./nginx.pid + --conf-path=./nginx.conf + "--with-ld-opt=-static" + --with-http_stub_status_module + --with-http_gzip_static_module + --with-file-aio + --with-pcre + "--with-cc-opt=-O2 -static -static-libgcc" + --without-http_ssi_module + --without-http_userid_module + --without-http_access_module + --without-http_autoindex_module + --without-http_geo_module + --without-http_map_module + --without-http_split_clients_module + --without-http_referer_module + --without-http_fastcgi_module + --without-http_uwsgi_module + --without-http_scgi_module + --without-http_memcached_module + --without-http_empty_gif_module + --without-http_browser_module + --without-http_upstream_ip_hash_module + --without-http_upstream_least_conn_module + --without-http_upstream_keepalive_module + --without-mail_pop3_module + --without-mail_imap_module + --without-mail_smtp_module + --with-http_realip_module +)