kawaiipunk/buildpack-nginx
1
0
Fork 0
mirror of https://github.com/dokku/buildpack-nginx.git synced 2026-04-24 09:37:36 +00:00
Code Issues Releases Wiki Activity

Merge pull request #101 from dokku/versioned-build

Browse Source 
fix: version-aware nginx binary caching and prebuilt downloads
This commit is contained in:
Jose Diaz-Gonzalez
2026-04-23 03:39:51 -04:00
committed by GitHub
parent 73e762c693 93f1162632
commit 8d1b1afa9f
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View File

@ -62,7 +62,7 @@ jobs:
GH_TOKEN: ${{ github.token }}
run: |
source "$GITHUB_WORKSPACE/conf/nginx-configure-flags"
cp /tmp/nginx-${NGINX_VERSION}/objs/nginx /tmp/nginx-linux-amd64
chmod +x /tmp/nginx-linux-amd64
cp /tmp/nginx-${NGINX_VERSION}/objs/nginx "/tmp/nginx-${NGINX_VERSION}-linux-amd64"
chmod +x "/tmp/nginx-${NGINX_VERSION}-linux-amd64"
gh release upload "${{ github.event.release.tag_name }}" \
/tmp/nginx-linux-amd64
"/tmp/nginx-${NGINX_VERSION}-linux-amd64"

18
bin/compile
View File

@ -60,18 +60,29 @@ if [[ ! -f "$BUILD_DIR/sigil/sigil" ]]; then
exit 1
fi
# Invalidate cache if version doesn't match
if [[ -f "${CACHE_DIR}/bin/nginx" ]] && [[ ! -f "${CACHE_DIR}/bin/.nginx-version" ]]; then
echo "-----> Cached nginx binary has no version marker, rebuilding"
rm -rf "${CACHE_DIR:?}/bin"
elif [[ -f "${CACHE_DIR}/bin/nginx" ]] && [[ -f "${CACHE_DIR}/bin/.nginx-version" ]] && [[ "$(cat "${CACHE_DIR}/bin/.nginx-version")" != "$NGINX_VERSION" ]]; then
CACHED_VERSION="$(cat "${CACHE_DIR}/bin/.nginx-version")"
echo "-----> Cached nginx ${CACHED_VERSION} does not match required ${NGINX_VERSION}, rebuilding"
rm -rf "${CACHE_DIR:?}/bin"
fi
if [[ -f "${CACHE_DIR}/bin/nginx" ]]; then
echo "-----> Reusing nginx binary from cache"
echo "-----> Reusing nginx ${NGINX_VERSION} 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"
elif curl -fsSL "https://github.com/${BUILDPACK_REPO}/releases/latest/download/nginx-${NGINX_VERSION}-linux-amd64" -o /tmp/nginx-linux-amd64 2>/dev/null; then
echo "-----> Using precompiled nginx ${NGINX_VERSION} 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"
echo "$NGINX_VERSION" >"${CACHE_DIR}/bin/.nginx-version"
rm -f /tmp/nginx-linux-amd64
else
@ -109,6 +120,7 @@ else
rm -rf "${CACHE_DIR:?}/bin" && mkdir -p "$CACHE_DIR/bin/"
# shellcheck disable=SC2086
cp -r $BUILD_DIR/nginx/* "$CACHE_DIR/bin/"
echo "$NGINX_VERSION" >"${CACHE_DIR}/bin/.nginx-version"
fi
# Update the PATH