Compare commits
31 Commits
Author | SHA1 | Date |
---|---|---|
Jose Diaz-Gonzalez | ec66a23266 | |
Pablo Brasero | dfcb3706f3 | |
Jose Diaz-Gonzalez | 14c274186a | |
Jose Diaz-Gonzalez | 863aab6f36 | |
Jose Diaz-Gonzalez | 2f08d686ff | |
Jose Diaz-Gonzalez | 936c024eac | |
Jose Diaz-Gonzalez | e833f6afad | |
Jose Diaz-Gonzalez | 3221fc1b85 | |
Jose Diaz-Gonzalez | 10d257b7ad | |
Jose Diaz-Gonzalez | b701653bda | |
Jose Diaz-Gonzalez | a6dd42bddb | |
Jose Diaz-Gonzalez | 130b184ec3 | |
josegonzalez | e26103764e | |
Igor Loskutov | eeb2caf824 | |
josegonzalez | 61bfffb6c6 | |
Felipe dos Anjos | bcbf61b1f5 | |
Jose Diaz-Gonzalez | 8345d0a22a | |
Jose Diaz-Gonzalez | 8560e5b5a9 | |
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 |
|
@ -0,0 +1,26 @@
|
||||||
|
---
|
||||||
|
name: 'review-app'
|
||||||
|
|
||||||
|
# yamllint disable-line rule:truthy
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
- main
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
review_app:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Cloning repo
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Push to dokku
|
||||||
|
uses: dokku/github-action@master
|
||||||
|
with:
|
||||||
|
git_remote_url: 'ssh://dokku@dokku.com/nginx-buildpack'
|
||||||
|
# specify `--force` as a flag for git pushes
|
||||||
|
git_push_flags: '--force'
|
||||||
|
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
|
|
@ -39,13 +39,17 @@ By default, this buildpack will 404 if a requested file is not found. For static
|
||||||
```shell
|
```shell
|
||||||
# where the app is named `static-app`
|
# where the app is named `static-app`
|
||||||
# and the desired default response is index.html
|
# and the desired default response is index.html
|
||||||
dokku config:set static-app NGINX_ROOT=index.html
|
dokku config:set static-app NGINX_DEFAULT_REQUEST=index.html
|
||||||
```
|
```
|
||||||
|
|
||||||
### Custom nginx config file
|
### Custom nginx config file
|
||||||
|
|
||||||
You may completely override the built-in nginx config by placing an `app-nginx.conf.sigil` file in the root, modeled after our own [`conf/app-nginx.conf.sigil`](https://github.com/dokku/buildpack-nginx/blob/master/conf/app-nginx.conf.sigil). This will be used inside of the container, and not by the host Dokku instance. See the [sigil project](https://github.com/gliderlabs/sigil) for more information concerning the sigil format.
|
You may completely override the built-in nginx config by placing an `app-nginx.conf.sigil` file in the root, modeled after our own [`conf/app-nginx.conf.sigil`](https://github.com/dokku/buildpack-nginx/blob/master/conf/app-nginx.conf.sigil). This will be used inside of the container, and not by the host Dokku instance. See the [sigil project](https://github.com/gliderlabs/sigil) for more information concerning the sigil format.
|
||||||
|
|
||||||
|
### Custom MIME types
|
||||||
|
|
||||||
|
Files will be served with a `Content-Type` according to a list of supported MIME types at [`conf/mime.types`](https://github.com/dokku/heroku-buildpack-nginx/blob/master/conf/mime.types). If you need to serve files of a MIME type not included in the list, you can provide your own `mime.types` file in the root.
|
||||||
|
|
||||||
## Credits and License
|
## Credits and License
|
||||||
|
|
||||||
`buildpack-nginx` is licensed under the CC0 1.0 Universal license and has been informed by many similar projects on the web.
|
`buildpack-nginx` is licensed under the CC0 1.0 Universal license and has been informed by many similar projects on the web.
|
||||||
|
|
26
bin/compile
26
bin/compile
|
@ -3,13 +3,13 @@
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
[[ $TRACE ]] && set -x
|
[[ $TRACE ]] && set -x
|
||||||
|
|
||||||
NGINX_VERSION="1.17.0"
|
NGINX_VERSION="1.25.2"
|
||||||
NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz"
|
NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz"
|
||||||
PCRE_VERSION="8.45"
|
PCRE_VERSION="10.42"
|
||||||
PCRE_TARBALL="pcre-${PCRE_VERSION}.tar.gz"
|
PCRE_TARBALL="pcre2-${PCRE_VERSION}.tar.gz"
|
||||||
SIGIL_VERSION="0.4.0"
|
SIGIL_VERSION="0.10.1"
|
||||||
SIGIL_TARBALL="sigil_${SIGIL_VERSION}_Linux_x86_64.tgz"
|
SIGIL_TARBALL="gliderlabs-sigil_${SIGIL_VERSION}_linux_amd64.tgz"
|
||||||
ZLIB_VERSION="1.2.11"
|
ZLIB_VERSION="1.3"
|
||||||
ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz"
|
ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz"
|
||||||
|
|
||||||
suppress() {
|
suppress() {
|
||||||
|
@ -57,7 +57,7 @@ fi
|
||||||
|
|
||||||
if [[ ! -d "${PCRE_TARBALL%.tar.gz}" ]]; then
|
if [[ ! -d "${PCRE_TARBALL%.tar.gz}" ]]; then
|
||||||
echo "-----> Download and unzip pcre ${PCRE_VERSION} via http"
|
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}"
|
tar xzf "${PCRE_TARBALL}" && rm -f "${PCRE_TARBALL}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -67,14 +67,18 @@ if [[ ! -d "${ZLIB_TARBALL%.tar.gz}" ]]; then
|
||||||
tar xzf "${ZLIB_TARBALL}" && rm -rf "${ZLIB_TARBALL}"
|
tar xzf "${ZLIB_TARBALL}" && rm -rf "${ZLIB_TARBALL}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ! -f "sigil" ]]; then
|
if [[ ! -f "gliderlabs-sigil-amd64" ]]; then
|
||||||
echo "-----> Download and unzip sigil ${SIGIL_VERSION} via http"
|
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}"
|
tar xzf "${SIGIL_TARBALL}" && rm -rf "${SIGIL_TARBALL}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p "$BUILD_DIR/sigil"
|
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}"
|
cd "nginx-${NGINX_VERSION}"
|
||||||
if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
|
if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
|
||||||
|
@ -83,7 +87,7 @@ if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
|
||||||
suppress ./configure \
|
suppress ./configure \
|
||||||
--with-cpu-opt=generic \
|
--with-cpu-opt=generic \
|
||||||
--prefix="$BUILD_DIR/nginx" \
|
--prefix="$BUILD_DIR/nginx" \
|
||||||
--with-pcre=../pcre-${PCRE_VERSION} \
|
--with-pcre=../pcre2-${PCRE_VERSION} \
|
||||||
--sbin-path=. \
|
--sbin-path=. \
|
||||||
--pid-path=./nginx.pid \
|
--pid-path=./nginx.pid \
|
||||||
--conf-path=./nginx.conf \
|
--conf-path=./nginx.conf \
|
||||||
|
|
|
@ -39,6 +39,7 @@ types {
|
||||||
application/vnd.wap.wmlc wmlc;
|
application/vnd.wap.wmlc wmlc;
|
||||||
application/vnd.google-earth.kml+xml kml;
|
application/vnd.google-earth.kml+xml kml;
|
||||||
application/vnd.google-earth.kmz kmz;
|
application/vnd.google-earth.kmz kmz;
|
||||||
|
application/wasm wasm;
|
||||||
application/x-7z-compressed 7z;
|
application/x-7z-compressed 7z;
|
||||||
application/x-cocoa cco;
|
application/x-cocoa cco;
|
||||||
application/x-java-archive-diff jardiff;
|
application/x-java-archive-diff jardiff;
|
||||||
|
|
Loading…
Reference in New Issue