Compare commits
21 Commits
59ea0b94e1
...
aa191df661
Author | SHA1 | Date |
---|---|---|
Jose Diaz-Gonzalez | aa191df661 | |
Jose Diaz-Gonzalez | 7fe92f4821 | |
Jose Diaz-Gonzalez | 25fb7889a5 | |
Jose Diaz-Gonzalez | 6381244e26 | |
Jose Diaz-Gonzalez | 7874622b04 | |
Jose Diaz-Gonzalez | 0329f9e0ff | |
Jose Diaz-Gonzalez | 043965bc7d | |
Jose Diaz-Gonzalez | 3a1e442373 | |
Jose Diaz-Gonzalez | 6a99e870e4 | |
Jose Diaz-Gonzalez | ad5e831e74 | |
Jose Diaz-Gonzalez | ed31137f94 | |
Jose Diaz-Gonzalez | a68149bce7 | |
Jose Diaz-Gonzalez | 6a592755ff | |
Jose Diaz-Gonzalez | 2b95cd179b | |
Jose Diaz-Gonzalez | 9b7f098ced | |
Jose Diaz-Gonzalez | 7154c020a1 | |
Jose Diaz-Gonzalez | a11d1ce303 | |
Jose Diaz-Gonzalez | 53b41ec631 | |
Jose Diaz-Gonzalez | c8eef60b09 | |
Jose Diaz-Gonzalez | 09fe857895 | |
Jose Diaz-Gonzalez | 31dc4746e2 |
|
@ -17,7 +17,7 @@ jobs:
|
|||
with:
|
||||
# destroy a review app
|
||||
command: review-apps:destroy
|
||||
git_remote_url: 'ssh://dokku@dokku.me:22/nginx-buildpack'
|
||||
git_remote_url: 'ssh://dokku@dokku.com/nginx-buildpack'
|
||||
# specify a name for the review app
|
||||
review_app_name: nginx-buildpack-${{ github.event.pull_request.number }}
|
||||
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||
|
|
|
@ -1,15 +1,28 @@
|
|||
#!/bin/sh -l
|
||||
if [ "$IS_REVIEW_APP" = "true" ]; then
|
||||
git config --global user.name 'Dokku Bot'
|
||||
git config --global user.email no-reply@dokku.com
|
||||
|
||||
echo "-----> Purging repo cache"
|
||||
ssh "$SSH_REMOTE" -- repo:purge-cache "$APP_NAME"
|
||||
|
||||
echo "-----> Setting the test domain name"
|
||||
ssh "$SSH_REMOTE" -- domains:set "$APP_NAME" "$APP_NAME.dokku.net"
|
||||
|
||||
echo "-----> Setting the buildpack to the current commit"
|
||||
echo "https://github.com/${GITHUB_REPOSITORY}.git#$GITHUB_SHA" > .buildpacks
|
||||
echo "-----> Ensure test includes vendored app-nginx.conf.sigil"
|
||||
cp conf/app-nginx.conf.sigil app-nginx.conf.sigil
|
||||
git add app-nginx.conf.sigil
|
||||
git commit -qm "feat: specify custom app-nginx.conf.sigil"
|
||||
|
||||
echo "-----> Ensure test includes vendored mime.types"
|
||||
cp conf/mime.types mime.types
|
||||
git add mime.types
|
||||
git commit -qm "feat: specify custom mime.types"
|
||||
|
||||
echo "-----> Setting the buildpack to the current ref $GITHUB_HEAD_REF"
|
||||
echo "https://github.com/${GITHUB_REPOSITORY}.git#$GITHUB_HEAD_REF" > .buildpacks
|
||||
git add .buildpacks
|
||||
git config --global user.name 'Dokku Bot'
|
||||
git config --global user.email no-reply@dokku.com
|
||||
git commit -qm "feat: specify $GITHUB_SHA as buildpack"
|
||||
fi
|
||||
|
||||
git rev-parse HEAD >ci-commit-override
|
||||
fi
|
||||
|
|
20
bin/compile
20
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
|
||||
|
||||
|
@ -69,12 +69,12 @@ fi
|
|||
|
||||
if [[ ! -f "sigil" ]]; 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/"
|
||||
cp -r gliderlabs-sigil-amd64 "$BUILD_DIR/sigil/sigil"
|
||||
|
||||
cd "nginx-${NGINX_VERSION}"
|
||||
if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
|
||||
|
@ -83,7 +83,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 \
|
||||
|
|
Loading…
Reference in New Issue