Merge pull request #65 from dokku/64-catch-bin-error

Ensure we check for the right sigil binary
fix: ensure we check for the right binary
2025-06-26 18:40:45 +00:00 · 2022-09-12 10:53:59 -04:00 · 2022-09-12 10:22:04 -04:00 · 2022-09-10 21:09:31 -04:00 · 2022-09-10 21:05:23 -04:00 · 2022-09-10 21:02:04 -04:00
1 changed files with 15 additions and 11 deletions
--- a/bin/compile
+++ b/bin/compile
@ -3,13 +3,13 @@
 set -eo pipefail
 [[ $TRACE ]] && set -x

-NGINX_VERSION="1.17.0"
+NGINX_VERSION="1.23.1"
 NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz"
-PCRE_VERSION="8.45"
-PCRE_TARBALL="pcre-${PCRE_VERSION}.tar.gz"
-SIGIL_VERSION="0.4.0"
-SIGIL_TARBALL="sigil_${SIGIL_VERSION}_Linux_x86_64.tgz"
-ZLIB_VERSION="1.2.11"
+PCRE_VERSION="10.40"
+PCRE_TARBALL="pcre2-${PCRE_VERSION}.tar.gz"
+SIGIL_VERSION="0.9.0"
+SIGIL_TARBALL="gliderlabs-sigil_${SIGIL_VERSION}_linux_amd64.tgz"
+ZLIB_VERSION="1.2.12"
 ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz"

 suppress() {
@ -57,7 +57,7 @@ fi

 if [[ ! -d "${PCRE_TARBALL%.tar.gz}" ]]; then
  echo "-----> Download and unzip pcre ${PCRE_VERSION} via http"
-  curl -sSL "https://downloads.sourceforge.net/project/pcre/pcre/${PCRE_VERSION}/${PCRE_TARBALL}" -o "${PCRE_TARBALL}"
+  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

@ -67,14 +67,18 @@ if [[ ! -d "${ZLIB_TARBALL%.tar.gz}" ]]; then
  tar xzf "${ZLIB_TARBALL}" && rm -rf "${ZLIB_TARBALL}"
 fi

-if [[ ! -f "sigil" ]]; then
+if [[ ! -f "gliderlabs-sigil-amd64" ]]; then
  echo "-----> Download and unzip sigil ${SIGIL_VERSION} via http"
-  curl -sSL "https://github.com/gliderlabs/sigil/releases/download/v${SIGIL_VERSION}/${SIGIL_TARBALL}" -o "${SIGIL_TARBALL}"
+  curl -sSL "https://github.com/gliderlabs/sigil/releases/download/v${SIGIL_VERSION}/gliderlabs-sigil_${SIGIL_VERSION}_linux_amd64.tgz" -o "${SIGIL_TARBALL}"
  tar xzf "${SIGIL_TARBALL}" && rm -rf "${SIGIL_TARBALL}"
 fi

 mkdir -p "$BUILD_DIR/sigil"
-cp -r sigil "$BUILD_DIR/sigil/"
+if [[ ! -f "gliderlabs-sigil-amd64" ]]; then
+  echo " !     Missing gliderlabs-sigil-amd64 binary"
+  exit 1
+fi
+cp -r gliderlabs-sigil-amd64 "$BUILD_DIR/sigil/sigil"

 cd "nginx-${NGINX_VERSION}"
 if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
@ -83,7 +87,7 @@ if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
  suppress ./configure \
    --with-cpu-opt=generic \
    --prefix="$BUILD_DIR/nginx" \
-    --with-pcre=../pcre-${PCRE_VERSION} \
+    --with-pcre=../pcre2-${PCRE_VERSION} \
    --sbin-path=. \
    --pid-path=./nginx.pid \
    --conf-path=./nginx.conf \
Author	SHA1	Message	Date
Jose Diaz-Gonzalez	8345d0a22a	Merge pull request #65 from dokku/64-catch-bin-error Ensure we check for the right sigil binary	2022-09-12 10:53:59 -04:00
Jose Diaz-Gonzalez	8560e5b5a9	fix: ensure we check for the right binary Closes #64	2022-09-12 10:22:04 -04:00
Jose Diaz-Gonzalez	aa191df661	Merge pull request #63 from dokku/upgrade-pcre Upgrade pcre to pcre2	2022-09-10 21:09:31 -04:00
Jose Diaz-Gonzalez	7fe92f4821	chore: remove extra debug statement	2022-09-10 21:05:23 -04:00
Jose Diaz-Gonzalez	25fb7889a5	fix: build against the correct directory	2022-09-10 21:02:04 -04:00
Jose Diaz-Gonzalez	6381244e26	debug: where is the pcre2 output	2022-09-10 20:57:21 -04:00
Jose Diaz-Gonzalez	7874622b04	feat: upgrade pcre to pcre2	2022-09-10 20:54:48 -04:00
Jose Diaz-Gonzalez	0329f9e0ff	Merge pull request #62 from dokku/upgrade-nginx Upgrade nginx to 1.23.1	2022-09-10 20:50:42 -04:00
Jose Diaz-Gonzalez	043965bc7d	feat: upgrade nginx to 1.23.1	2022-09-10 20:46:19 -04:00
Jose Diaz-Gonzalez	3a1e442373	Merge pull request #61 from dokku/upgrade-sigil Upgrade sigil to 0.9.0	2022-09-10 20:44:47 -04:00
Jose Diaz-Gonzalez	6a99e870e4	fix: copy the new binary into the correct place	2022-09-10 20:42:01 -04:00
Jose Diaz-Gonzalez	ad5e831e74	chore: debug	2022-09-10 20:36:01 -04:00
Jose Diaz-Gonzalez	ed31137f94	feat: upgrade sigil to 0.9.0	2022-09-10 20:31:57 -04:00
Jose Diaz-Gonzalez	a68149bce7	Merge pull request #60 from dokku/upgrade-zlib Upgrade zlib to 1.2.12	2022-09-10 20:30:21 -04:00
Jose Diaz-Gonzalez	6a592755ff	feat: upgrade zlib to 1.2.12	2022-09-10 20:27:47 -04:00