1
0
mirror of https://github.com/dokku/buildpack-nginx.git synced 2026-04-19 23:53:15 +00:00

17 Commits

Author SHA1 Message Date
27155d8eaf feat: precompile nginx binary on release and download during builds
On release creation, a GitHub Actions workflow compiles a statically-linked
nginx binary and uploads it as a release asset. During builds, the compile
script now attempts to download the precompiled binary before falling back
to source compilation, significantly speeding up cold-cache deploys.
2026-04-19 19:16:11 -04:00
d157f257ce Merge pull request #97 from dokku/josegonzalez-patch-1
chore: upgrade to nginx 1.29.8
2026-04-19 18:47:12 -04:00
a0f7d9e34f chore: upgrade to nginx 1.29.8 2026-04-19 18:44:00 -04:00
86dfeec2ca Merge pull request #95 from dokku/josegonzalez-patch-1
chore: rename job to deploy
2026-03-07 11:11:39 -05:00
ca3942c86b Merge pull request #96 from dokku/josegonzalez-patch-2
chore: upgrade zlib from 1.3.1 to 1.3.2
2026-03-07 11:10:18 -05:00
6370be31a4 chore: upgrade zlib from 1.3.1 to 1.3.2 2026-03-07 11:08:09 -05:00
bc25e56ef2 chore: rename job to deploy 2026-03-07 11:04:45 -05:00
f55c587fe7 chore: remove debugging 2026-03-07 11:01:29 -05:00
bf9a02f4e4 chore: drop debugging 2026-03-07 11:01:01 -05:00
e6606b78d0 Merge pull request #94 from dokku/josegonzalez-patch-1
fix: checkout the code when cleaning up review apps
2026-03-07 10:58:35 -05:00
b13b59c326 fix: checkout the code when cleaning up review apps 2026-03-07 10:57:29 -05:00
c8c38bb28f Merge pull request #93 from dokku/josegonzalez-patch-1
feat: enable trace mode on cleanups
2026-03-07 10:56:16 -05:00
5763938ba0 feat: enable trace mode on cleanups 2026-03-07 10:55:26 -05:00
488cf5fed2 Merge pull request #92 from dokku/josegonzalez-patch-1
chore: ugprade nginx from 1.29.3 to 1.29.5
2026-03-07 10:34:53 -05:00
e710a8facb chore: ugprade nginx from 1.29.3 to 1.29.5 2026-03-07 10:33:06 -05:00
c352c1447c Merge pull request #91 from dokku/162-test-hook
debug: check that the bin/ci-post-review-app-destroy hook gets triggered
2026-03-07 10:27:49 -05:00
6639e59190 debug: check that the bin/ci-post-review-app-destroy hook gets triggered 2026-03-07 10:27:02 -05:00
5 changed files with 125 additions and 29 deletions

View File

@ -9,7 +9,7 @@ on:
- main
jobs:
review_app:
deploy:
runs-on: ubuntu-latest
steps:
- name: Cloning repo

81
.github/workflows/release.yml vendored Normal file
View File

@ -0,0 +1,81 @@
---
name: "release"
# yamllint disable-line rule:truthy
on:
release:
types: [created]
jobs:
build-assets:
runs-on: ubuntu-latest
steps:
- 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: |
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
- name: Compile nginx
run: |
cd /tmp/nginx-${{ steps.versions.outputs.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
sed -i "/CFLAGS/s/ \-O //g" objs/Makefile
make -j"$(nproc)"
cp objs/nginx /tmp/nginx-linux-amd64
chmod +x /tmp/nginx-linux-amd64
- name: Upload release assets
env:
GH_TOKEN: ${{ github.token }}
run: |
gh release upload "${{ github.event.release.tag_name }}" \
/tmp/nginx-linux-amd64

View File

@ -12,6 +12,9 @@ jobs:
destroy_review_app:
runs-on: ubuntu-latest
steps:
- name: Cloning repo
uses: actions/checkout@v6
- name: Destroy the review app
uses: dokku/github-action@master
with:

3
bin/ci-post-review-app-destroy Executable file
View File

@ -0,0 +1,3 @@
#!/bin/sh -l
echo "Running ci-post-review-app-destroy"

View File

@ -4,7 +4,7 @@ set -eo pipefail
[[ $TRACE ]] && set -x
# https://nginx.org/en/download.html
NGINX_VERSION="1.29.3"
NGINX_VERSION="1.29.8"
NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz"
# https://github.com/PCRE2Project/pcre2/releases
PCRE_VERSION="10.47"
@ -12,8 +12,9 @@ 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.1"
ZLIB_VERSION="1.3.2"
ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz"
BUILDPACK_REPO="dokku/heroku-buildpack-nginx"
suppress() {
/bin/rm --force /tmp/surpress.out 2>/dev/null
@ -52,24 +53,6 @@ fi
cd "$CACHE_DIR"
if [[ ! -d "${NGINX_TARBALL%.tar.gz}" ]]; then
echo "-----> Download and unzip nginx ${NGINX_VERSION} via http"
curl -sSL "https://nginx.org/download/${NGINX_TARBALL}" -o "${NGINX_TARBALL}"
tar xzf "${NGINX_TARBALL}" && rm -f "${NGINX_TARBALL}"
fi
if [[ ! -d "${PCRE_TARBALL%.tar.gz}" ]]; then
echo "-----> Download and unzip pcre ${PCRE_VERSION} via http"
curl -sSL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PCRE_VERSION}/${PCRE_TARBALL}" -o "${PCRE_TARBALL}"
tar xzf "${PCRE_TARBALL}" && rm -f "${PCRE_TARBALL}"
fi
if [[ ! -d "${ZLIB_TARBALL%.tar.gz}" ]]; then
echo "-----> Download and unzip zlib ${ZLIB_VERSION} via http"
curl -sSL "https://github.com/madler/zlib/archive/v${ZLIB_VERSION}.tar.gz" -o "${ZLIB_TARBALL}"
tar xzf "${ZLIB_TARBALL}" && rm -rf "${ZLIB_TARBALL}"
fi
mkdir -p "$BUILD_DIR/sigil"
if [[ ! -f "$BUILD_DIR/sigil/sigil-${SIGIL_VERSION}" ]]; then
echo "-----> Download and unzip sigil ${SIGIL_VERSION} via http"
@ -83,8 +66,40 @@ if [[ ! -f "$BUILD_DIR/sigil/sigil" ]]; then
exit 1
fi
cd "nginx-${NGINX_VERSION}"
if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
if [[ -f "${CACHE_DIR}/bin/nginx" ]]; then
echo "-----> Reusing nginx binary from cache"
mkdir -p "$BUILD_DIR/nginx"
# shellcheck disable=SC2086
cp -r $CACHE_DIR/bin/* "$BUILD_DIR/nginx/"
elif curl -fsSL "https://github.com/${BUILDPACK_REPO}/releases/latest/download/nginx-linux-amd64" -o /tmp/nginx-linux-amd64 2>/dev/null; then
echo "-----> Using precompiled nginx binary"
mkdir -p "$BUILD_DIR/nginx" "${CACHE_DIR}/bin"
chmod +x /tmp/nginx-linux-amd64
cp /tmp/nginx-linux-amd64 "$BUILD_DIR/nginx/nginx"
cp /tmp/nginx-linux-amd64 "${CACHE_DIR}/bin/nginx"
rm -f /tmp/nginx-linux-amd64
else
if [[ ! -d "${NGINX_TARBALL%.tar.gz}" ]]; then
echo "-----> Download and unzip nginx ${NGINX_VERSION} via http"
curl -sSL "https://nginx.org/download/${NGINX_TARBALL}" -o "${NGINX_TARBALL}"
tar xzf "${NGINX_TARBALL}" && rm -f "${NGINX_TARBALL}"
fi
if [[ ! -d "${PCRE_TARBALL%.tar.gz}" ]]; then
echo "-----> Download and unzip pcre ${PCRE_VERSION} via http"
curl -sSL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PCRE_VERSION}/${PCRE_TARBALL}" -o "${PCRE_TARBALL}"
tar xzf "${PCRE_TARBALL}" && rm -f "${PCRE_TARBALL}"
fi
if [[ ! -d "${ZLIB_TARBALL%.tar.gz}" ]]; then
echo "-----> Download and unzip zlib ${ZLIB_VERSION} via http"
curl -sSL "https://github.com/madler/zlib/archive/v${ZLIB_VERSION}.tar.gz" -o "${ZLIB_TARBALL}"
tar xzf "${ZLIB_TARBALL}" && rm -rf "${ZLIB_TARBALL}"
fi
cd "nginx-${NGINX_VERSION}"
echo "-----> Compiling static nginx binary"
mkdir "$BUILD_DIR/nginx"
suppress ./configure \
@ -130,12 +145,6 @@ if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
rm -rf "${CACHE_DIR:?}/bin" && mkdir -p "$CACHE_DIR/bin/"
# shellcheck disable=SC2086
cp -r $BUILD_DIR/nginx/* "$CACHE_DIR/bin/"
else
echo "-----> Reusing nginx binary from cache"
mkdir -p "$BUILD_DIR/nginx"
# shellcheck disable=SC2086
cp -r $CACHE_DIR/bin/* "$BUILD_DIR/nginx/"
fi
# Update the PATH