oschaaf closed pull request #1598: Dockerfiles for Alpine 3.8/edge build with Nginx 1.14/1.15 (stable/ma… URL: https://github.com/apache/incubator-pagespeed-ngx/pull/1598
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/docker/README.md b/docker/README.md new file mode 100644 index 000000000..0c8aedc79 --- /dev/null +++ b/docker/README.md @@ -0,0 +1,187 @@ +# Supported tags and respective `Dockerfile` links + +- [`1.13.35.2`, `stable`, `1.13.35`, `1.13`, `1.13.35.2-alpine3.8`, `1.13.35-alpine3.8`, `1.13-alpine3.8`, `stable-alpine3.8`, `1.13.35.2-alpine3.8-ngx1.14`, `1.13.35-alpine3.8-ngx1.14`, `1.13-alpine3.8-ngx1.14`, `stable-alpine3.8-ngx1.14`, `latest` (*alpine-3.8/nginx-stable/Dockerfile*)](https://github.com/apache/incubator-pagespeed-ngx/blob/master/docker/alpine-3.8/nginx-stable/Dockerfile) +- [`1.13.35.2-edge`, `stable-edge`, `edge`, `1.13.35-edge`, `1.13-edge`, `1.13.35.2-edge-ngx1.14`, `1.13.35-edge-ngx1.14`, `1.13-edge-ngx1.14`, `stable-edge-ngx1.14` (*alpine-edge/nginx-stable/Dockerfile*)](https://github.com/apache/incubator-pagespeed-ngx/blob/master/docker/alpine-edge/nginx-stable/Dockerfile) +- [`1.13.35.2-alpine3.8-ngx1.15`, `ngx1.15`, `1.13.35-alpine3.8-ngx1.15`, `1.13-alpine3.8-ngx1.15`, `stable-alpine3.8-ngx1.15` (*alpine-3.8/nginx-mainline/Dockerfile*)](https://github.com/apache/incubator-pagespeed-ngx/blob//master/docker/alpine-3.8/nginx-mainline/Dockerfile) +- [`1.13.35.2-edge-ngx1.15`, `1.13.35-edge-ngx1.15`, `1.13-edge-ngx1.15`, `stable-edge-ngx1.15` (*alpine-edge/nginx-mainline/Dockerfile*)](https://github.com/apache/incubator-pagespeed-ngx/blob/master/docker/alpine-edge/nginx-mainline/Dockerfile) + +# Quick reference + +- **Where to get help**: + [Read the wiki](https://github.com/apache/incubator-pagespeed-mod/wiki), [Ask a question on the mailing list](https://groups.google.com/group/ngx-pagespeed-discuss) + +- **Docker image repository**: + [Dockerhub](https://hub.docker.com/r/pagespeed/nginx-pagespeed) + +- **Git Dockerfile repository**: + [Github](https://github.com/apache/incubator-pagespeed-ngx/tree/master/docker) + +- **Where to file issues**: + [https://github.com/We-Amp/ngx-pagespeed-alpine/issues](https://github.com/apache/incubator-pagespeed-ngx/issues) + +- **Docker images maintained by**: + [Nico Berlee](mailto:nico.ber...@on2it.net) + +- **Supported Docker versions**: + [the latest release](https://github.com/docker/docker-ce/releases/latest) (down to 1.12 on a best-effort basis) + +# What is pagespeed? + +The PageSpeed Modules, [mod_pagespeed](https://github.com/apache/incubator-pagespeed-mod) and [ngx_pagespeed](https://github.com/apache/incubator-pagespeed-ngx), are open-source webserver modules that [optimize your site automatically](https://www.modpagespeed.com/doc/filters). + +ngx_pagespeed speeds up your site and reduces page load time by automatically +applying web performance best practices to pages and associated assets (CSS, +JavaScript, images) without requiring you to modify your existing content or +workflow. Features include: + +- Image optimization: stripping meta-data, dynamic resizing, recompression +- CSS & JavaScript minification, concatenation, inlining, and outlining +- Small resource inlining +- Deferring image and JavaScript loading +- HTML rewriting +- Cache lifetime extension +- and [more](https://developers.google.com/speed/docs/mod_pagespeed/config_filters) + +To see ngx_pagespeed in action, with example pages for each of the +optimizations, see our [demonstration site](http://ngxpagespeed.com). + + + +# What is nginx? + +Nginx (pronounced "engine-x") is an open source reverse proxy server for HTTP, HTTPS, SMTP, POP3, and IMAP protocols, as well as a load balancer, HTTP cache, and a web server (origin server). The nginx project started with a strong focus on high concurrency, high performance and low memory usage. +> [wikipedia.org/wiki/Nginx](https://en.wikipedia.org/wiki/Nginx) + +# What is nginx-pagespeed? + +The nginx-pagespeed brings all the goods of nginx and pagespeed together in one single small alpine docker image. Nginx-pagespeed aims to be 100% compatible with the plain [nginx](https://hub.docker.com/_/nginx/) images. Meaning, nginx-pagespeed can be a safe drop-in replacement for any container running `nginx:alpine`. + +Nginx-pagespeed makes it easy to start optimizing your website by reducing page load time, without requiring you to modify existing content. + +# How to use this image + +## Hosting some simple static content + +```console +$ docker run --name pagespeed-nginx -v /some/content:/usr/share/nginx/html:ro -d pagespeed/nginx-pagespeed +``` + +Alternatively, a simple `Dockerfile` can be used to generate a new image that includes the necessary content (which is a much cleaner solution than the bind mount above): + +```dockerfile +FROM pagespeed/nginx-pagespeed +COPY static-html-directory /usr/share/nginx/html +``` + +Place this file in the same directory as your directory of content ("static-html-directory"), run `docker build -t some-content-ngxpagespeed .`, then start your container: + +```console +$ docker run --name my-nginx-pagespeed -d some-content-ngxpagespeed +``` + +## Exposing external port + +```console +$ docker run --name my-nginx-pagespeed -d -p 8080:80 some-content-ngxpagespeed +``` + +Then you can hit `http://localhost:8080` or `http://host-ip:8080` in your browser. + +## Complex configuration + +```console +$ docker run --name my-custom-nginx-pagespeed -v /host/path/nginx.conf:/etc/nginx/nginx.conf:ro -d pagespeed/nginx-pagespeed +``` + +For information on the syntax of the nginx configuration files, see [the official documentation](http://nginx.org/en/docs/) (specifically the [Beginner's Guide](http://nginx.org/en/docs/beginners_guide.html#conf_structure)). For pagespeed specific nginx config syntax, see [Beginner's guide](https://www.modpagespeed.com/doc/configuration) or a complete overview of [all pagespeed filters](https://www.ngxpagespeed.com/). +For a quick start on pagespeed specific configuration see [] + +If you wish to adapt the default configuration, use something like the following to copy it from a running nginx-pagespeed container: + +```console +$ docker run --name tmp-ngxpagespeed-container -d pagespeed/nginx-pagespeed +$ docker cp tmp-ngxpagespeed-container:/etc/nginx/nginx.conf /host/path/nginx.conf +$ docker rm -f tmp-ngxpagespeed-container +``` + +This can also be accomplished more cleanly using a simple `Dockerfile` (in `/host/path/`): + +```dockerfile +FROM pagespeed/nginx-pagespeed +COPY nginx.conf /etc/nginx/nginx.conf +``` + +If you add a custom `CMD` in the Dockerfile, be sure to include `-g daemon off;` in the `CMD` in order for nginx to stay in the foreground, so that Docker can track the process properly (otherwise your container will stop immediately after starting)! + +Then build the image with `docker build -t custom-ngxpagespeed .` and run it as follows: + +```console +$ docker run --name my-custom-ngxpagespeed-container -d custom-ngxpagespeed +``` + +### Using environment variables in nginx configuration + +Out-of-the-box, nginx doesn't support environment variables inside most configuration blocks. But `envsubst` may be used as a workaround if you need to generate your nginx configuration dynamically before nginx starts. + +Here is an example using docker-compose.yml: + +```yaml +web: + image: pagespeed/nginx-pagespeed + volumes: + - ./mysite.template:/etc/nginx/conf.d/mysite.template + ports: + - "8080:80" + environment: + - NGINX_HOST=foobar.com + - NGINX_PORT=80 + command: /bin/bash -c "envsubst < /etc/nginx/conf.d/mysite.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'" +``` + +The `mysite.template` file may then contain variable references like this: + +`listen ${NGINX_PORT}; +` + +# Image Variants + +The `pagespeed/nginx-pagespeed` images come in many flavors, each designed for a specific use case. + +## `pagespeed/nginx-pagespeed:<version>` + +This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. + +## `nginx:edge` + +This image has the most up-to-date system packages available in the [Alpine Linux project](http://alpinelinux.org). This means the latest LibreSSL and musl-libc, with the downside of having less tested system packages. + + +## Using the Dockerfile +### Use docker build command to build an image from dockerfile: + docker build -t <image_tag> <dockerfile_path> . + $ docker build -t ngxpagespeed-alpine38-ngxstable stable/3.8/nginx-stable + Refer [this](https://docs.docker.com/engine/reference/commandline/build/) for additional options. + +### Run this container as an independent service: + $ docker run -d -p 80:80 <image_tag> + Refer [this](https://docs.docker.com/engine/reference/run/) for additional options. + +## Requirements for building: +- > 3 GB of free diskspace +- 2GB of memory +- an x86_64 compatible processor +- Docker CE > 17.3.2 + + +# Disclaimer +Apache PageSpeed is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. + +# License +View [PageSpeed license information](https://github.com/apache/incubator-pagespeed-ngx/blob/master/LICENSE) +View [Nginx license information](http://nginx.org/LICENSE) + +As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained). + +Some additional license information which was able to be auto-detected might be found in [the `repo-info` repository's `nginx/` directory](https://github.com/docker-library/repo-info/tree/master/repos/nginx). + +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses for all software contained within. diff --git a/docker/alpine-3.8/nginx-mainline/Dockerfile b/docker/alpine-3.8/nginx-mainline/Dockerfile new file mode 100644 index 000000000..db227dd32 --- /dev/null +++ b/docker/alpine-3.8/nginx-mainline/Dockerfile @@ -0,0 +1,230 @@ +ARG ALPINE_VERSION=3.8 + +######################## +# Build pagespeed psol # +######################## +FROM alpine:$ALPINE_VERSION as pagespeed + +# Check https://github.com/apache/incubator-pagespeed-mod/tags +ARG MOD_PAGESPEED_TAG=v1.13.35.2 + +RUN apk add --no-cache \ + apache2-dev \ + apr-dev \ + apr-util-dev \ + build-base \ + curl \ + gettext-dev \ + git \ + gperf \ + icu-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + libressl-dev \ + pcre-dev \ + py-setuptools \ + zlib-dev \ + ; + +WORKDIR /usr/src +RUN git clone -b ${MOD_PAGESPEED_TAG} \ + --recurse-submodules \ + --depth=1 \ + -c advice.detachedHead=false \ + -j`nproc` \ + https://github.com/apache/incubator-pagespeed-mod.git \ + modpagespeed \ + ; + +WORKDIR /usr/src/modpagespeed + +COPY patches/modpagespeed/*.patch ./ + +RUN for i in *.patch; do printf "\r\nApplying patch ${i%%.*}\r\n"; patch -p1 < $i || exit 1; done + +WORKDIR /usr/src/modpagespeed/tools/gyp +RUN ./setup.py install + +WORKDIR /usr/src/modpagespeed + +RUN build/gyp_chromium --depth=. \ + -D use_system_libs=1 \ + && \ + cd /usr/src/modpagespeed/pagespeed/automatic && \ + make psol BUILDTYPE=Release \ + CFLAGS+="-I/usr/include/apr-1" \ + CXXFLAGS+="-I/usr/include/apr-1 -DUCHAR_TYPE=uint16_t" \ + -j`nproc` \ + ; + +RUN mkdir -p /usr/src/ngxpagespeed/psol/lib/Release/linux/x64 && \ + mkdir -p /usr/src/ngxpagespeed/psol/include/out/Release && \ + cp -R out/Release/obj /usr/src/ngxpagespeed/psol/include/out/Release/ && \ + cp -R pagespeed/automatic/pagespeed_automatic.a /usr/src/ngxpagespeed/psol/lib/Release/linux/x64/ && \ + cp -R net \ + pagespeed \ + testing \ + third_party \ + url \ + /usr/src/ngxpagespeed/psol/include/ \ + ; + + +########################################## +# Build Nginx with support for PageSpeed # +########################################## +FROM alpine:$ALPINE_VERSION AS nginx + +# Check https://github.com/apache/incubator-pagespeed-ngx/tags +ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable + +# Check http://nginx.org/en/download.html for the latest version. +ARG NGINX_VERSION=1.15.4 +ARG NGINX_PGPKEY=520A9993A1C052F8 +ARG NGINX_BUILD_CONFIG="\ + --prefix=/etc/nginx \ + --sbin-path=/usr/sbin/nginx \ + --modules-path=/usr/lib/nginx/modules \ + --conf-path=/etc/nginx/nginx.conf \ + --error-log-path=/var/log/nginx/error.log \ + --http-log-path=/var/log/nginx/access.log \ + --pid-path=/var/run/nginx.pid \ + --lock-path=/var/run/nginx.lock \ + --http-client-body-temp-path=/var/cache/nginx/client_temp \ + --http-proxy-temp-path=/var/cache/nginx/proxy_temp \ + --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp \ + --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp \ + --http-scgi-temp-path=/var/cache/nginx/scgi_temp \ + --user=nginx \ + --group=nginx \ + --with-http_ssl_module \ + --with-http_realip_module \ + --with-http_addition_module \ + --with-http_sub_module \ + --with-http_dav_module \ + --with-http_flv_module \ + --with-http_mp4_module \ + --with-http_gunzip_module \ + --with-http_gzip_static_module \ + --with-http_random_index_module \ + --with-http_secure_link_module \ + --with-http_stub_status_module \ + --with-http_auth_request_module \ + --with-http_xslt_module=dynamic \ + --with-http_image_filter_module=dynamic \ + --with-http_geoip_module=dynamic \ + --with-threads \ + --with-stream \ + --with-stream_ssl_module \ + --with-stream_ssl_preread_module \ + --with-stream_realip_module \ + --with-stream_geoip_module=dynamic \ + --with-http_slice_module \ + --with-mail \ + --with-mail_ssl_module \ + --with-compat \ + --with-file-aio \ + --with-http_v2_module \ + " + +RUN apk add --no-cache \ + apr-dev \ + apr-util-dev \ + build-base \ + ca-certificates \ + gd-dev \ + geoip-dev \ + git \ + gnupg \ + icu-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + libxslt-dev \ + linux-headers \ + libressl-dev \ + pcre-dev \ + tar \ + zlib-dev \ + ; + +WORKDIR /usr/src +RUN git clone -b ${NGX_PAGESPEED_TAG} \ + --recurse-submodules \ + --shallow-submodules \ + --depth=1 \ + -c advice.detachedHead=false \ + -j`nproc` \ + https://github.com/apache/incubator-pagespeed-ngx.git \ + ngxpagespeed \ + ; + +RUN wget https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz \ + https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz.asc && \ + (gpg --keyserver ha.pool.sks-keyservers.net --keyserver-options timeout=10 --recv-keys ${NGINX_PGPKEY} || \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --keyserver-options timeout=10 --recv-keys ${NGINX_PGPKEY} || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --keyserver-options timeout=10 --recv-keys $NGINX_PGPKEY} ) && \ + gpg --trusted-key ${NGINX_PGPKEY} --verify nginx-${NGINX_VERSION}.tar.gz.asc + +COPY --from=pagespeed /usr/src/ngxpagespeed /usr/src/ngxpagespeed/ + +WORKDIR /usr/src/nginx + +RUN tar zxf ../nginx-${NGINX_VERSION}.tar.gz --strip-components=1 -C . && \ + ./configure \ + ${NGINX_BUILD_CONFIG} \ + --add-module=/usr/src/ngxpagespeed \ + --with-ld-opt="-Wl,-z,relro,--start-group -lapr-1 -laprutil-1 -licudata -licuuc -lpng -lturbojpeg -ljpeg" \ + && \ + make install -j`nproc` + +RUN rm -rf /etc/nginx/html/ && \ + mkdir /etc/nginx/conf.d/ && \ + mkdir -p /usr/share/nginx/html/ && \ + sed -i 's|^</body>|<p><a href="https://www.ngxpagespeed.com/";><img src="pagespeed.png" title="Nginx module for rewriting web pages to reduce latency and bandwidth" /></a></p>\n</body>|' html/index.html && \ + install -m644 html/index.html /usr/share/nginx/html/ && \ + install -m644 html/50x.html /usr/share/nginx/html/ && \ + ln -s ../../usr/lib/nginx/modules /etc/nginx/modules && \ + strip /usr/sbin/nginx* \ + /usr/lib/nginx/modules/*.so \ + ; + +COPY conf/nginx.conf /etc/nginx/nginx.conf +COPY conf/nginx.vh.default.conf /etc/nginx/conf.d/default.conf +COPY pagespeed.png /usr/share/nginx/html/ + + +########################################## +# Combine everything with minimal layers # +########################################## +FROM alpine:$ALPINE_VERSION +LABEL maintainer="Nico Berlee <nico.ber...@on2it.net>" \ + version.mod-pagespeed="1.13.35.2" \ + version.nginx="1.15.4" \ + version.ngx-pagespeed="1.13.35.2" + +COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin +COPY --from=nginx /usr/sbin/nginx /usr/sbin/nginx +COPY --from=nginx /usr/lib/nginx/modules/ /usr/lib/nginx/modules/ +COPY --from=nginx /etc/nginx /etc/nginx +COPY --from=nginx /usr/share/nginx/html/ /usr/share/nginx/html/ + +RUN apk --no-cache upgrade && \ + scanelf --needed --nobanner --format '%n#p' /usr/sbin/nginx /usr/lib/nginx/modules/*.so /usr/local/bin/envsubst \ + | tr ',' '\n' \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + | xargs apk add --no-cache \ + && \ + apk add --no-cache tzdata + +RUN addgroup -S nginx && \ + adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx && \ + install -g nginx -o nginx -d /var/cache/ngx_pagespeed && \ + mkdir -p /var/log/nginx && \ + ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log + +EXPOSE 80 + +STOPSIGNAL SIGTERM + +CMD ["/usr/sbin/nginx", "-g", "daemon off;"] diff --git a/docker/alpine-3.8/nginx-mainline/conf/nginx.conf b/docker/alpine-3.8/nginx-mainline/conf/nginx.conf new file mode 100644 index 000000000..e4bad8dbc --- /dev/null +++ b/docker/alpine-3.8/nginx-mainline/conf/nginx.conf @@ -0,0 +1,32 @@ + +user nginx; +worker_processes 1; + +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + include /etc/nginx/conf.d/*.conf; +} diff --git a/docker/alpine-3.8/nginx-mainline/conf/nginx.vh.default.conf b/docker/alpine-3.8/nginx-mainline/conf/nginx.vh.default.conf new file mode 100644 index 000000000..479c979c2 --- /dev/null +++ b/docker/alpine-3.8/nginx-mainline/conf/nginx.vh.default.conf @@ -0,0 +1,57 @@ +server { + listen 80; + server_name localhost; + + #charset koi8-r; + #access_log /var/log/nginx/host.access.log main; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + pagespeed on; + + # Needs to exist and be writable by nginx. Use tmpfs for best performance. + pagespeed FileCachePath /var/cache/ngx_pagespeed; + + # Ensure requests for pagespeed optimized resources go to the pagespeed handler + # and no extraneous headers get set. + location ~ "\.pagespeed\.([a-z]\.)?[a-z]{2}\.[^.]{10}\.[^.]+" { + add_header "" ""; + } + location ~ "^/pagespeed_static/" { } + location ~ "^/ngx_pagespeed_beacon$" { } + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} +} + diff --git a/docker/alpine-3.8/nginx-mainline/pagespeed.png b/docker/alpine-3.8/nginx-mainline/pagespeed.png new file mode 100644 index 000000000..bd7a2b7f4 Binary files /dev/null and b/docker/alpine-3.8/nginx-mainline/pagespeed.png differ diff --git a/docker/alpine-3.8/nginx-mainline/patches/modpagespeed/automatic_makefile.patch b/docker/alpine-3.8/nginx-mainline/patches/modpagespeed/automatic_makefile.patch new file mode 100644 index 000000000..992a37bfd --- /dev/null +++ b/docker/alpine-3.8/nginx-mainline/patches/modpagespeed/automatic_makefile.patch @@ -0,0 +1,31 @@ +--- a/pagespeed/automatic/Makefile ++++ b/pagespeed/automatic/Makefile +@@ -146,8 +146,6 @@ + pagespeed/libpagespeed_thread.a \ + pagespeed/libpthread_system.a \ + pagespeed/libutil.a \ +- third_party/apr/libapr.a \ +- third_party/aprutil/libaprutil.a \ + third_party/base64/libbase64.a \ + third_party/chromium/src/base/third_party/dynamic_annotations/libdynamic_annotations.a \ + third_party/css_parser/libcss_parser.a \ +@@ -163,18 +161,11 @@ + third_party/grpc/libgrpc_core.a \ + third_party/grpc/libgrpc_cpp.a \ + third_party/hiredis/libhiredis.a \ +- third_party/icu/libicudata.a \ +- third_party/icu/libicuuc.a \ + third_party/jsoncpp/libjsoncpp.a \ +- third_party/libjpeg_turbo/libjpeg.a \ +- third_party/libjpeg_turbo/src/libjpeg_turbo.a \ +- third_party/libpng/libpng.a \ + third_party/optipng/libopngreduc.a \ + third_party/protobuf/libprotobuf_full_do_not_use.a \ + third_party/re2/libre2.a \ +- third_party/serf/libopenssl.a \ + third_party/serf/libserf.a \ +- third_party/zlib/libzlib.a \ + url/liburl_lib.a + + # The 'gclient' build flow uses 'xcodebuild' on Mac and 'make' on Linux. + diff --git a/docker/alpine-3.8/nginx-mainline/patches/modpagespeed/libpng16.patch b/docker/alpine-3.8/nginx-mainline/patches/modpagespeed/libpng16.patch new file mode 100644 index 000000000..24aa63c2f --- /dev/null +++ b/docker/alpine-3.8/nginx-mainline/patches/modpagespeed/libpng16.patch @@ -0,0 +1,141 @@ +From 7ea8d5fc141c7067c54ffa2b9fbc552c15089ca6 Mon Sep 17 00:00:00 2001 +From: ashishk-1 <ashis...@gdbtech.in> +Date: Thu, 18 Jan 2018 22:14:05 +0530 +Subject: [PATCH] Upgrading libpng library to version 1.6 (#1724) + +--- + net/instaweb/rewriter/image.cc | 8 ++++++++ + pagespeed/kernel/image/gif_reader.cc | 4 ++-- + pagespeed/kernel/image/image_converter.cc | 6 ++++++ + pagespeed/kernel/image/png_optimizer_test.cc | 6 ++++++ + third_party/libpng/libpng.gyp | 26 +++++++++++++++++++++++--- + third_party/libpng/src | 2 +- + 6 files changed, 46 insertions(+), 6 deletions(-) + +diff --git a/net/instaweb/rewriter/image.cc b/net/instaweb/rewriter/image.cc +index 4f631182a..bb67bba35 100644 +--- a/net/instaweb/rewriter/image.cc ++++ b/net/instaweb/rewriter/image.cc +@@ -21,6 +21,14 @@ + #include <algorithm> + #include <cstddef> + ++extern "C" { ++#ifdef USE_SYSTEM_ZLIB ++#include "zlib.h" ++#else ++#include "third_party/zlib/zlib.h" ++#endif ++} // extern "C" ++ + #include "base/logging.h" + #include "net/instaweb/rewriter/cached_result.pb.h" + #include "net/instaweb/rewriter/public/image_data_lookup.h" +diff --git a/pagespeed/kernel/image/gif_reader.cc b/pagespeed/kernel/image/gif_reader.cc +index 7de69b3d7..bb0bc9cfc 100644 +--- a/pagespeed/kernel/image/gif_reader.cc ++++ b/pagespeed/kernel/image/gif_reader.cc +@@ -411,8 +411,8 @@ bool ReadGifToPng(GifFileType* gif_file, + png_uint_32 height = png_get_image_height(paletted_png_ptr, + paletted_info_ptr); + for (png_uint_32 row = 1; row < height; ++row) { +- memcpy(paletted_info_ptr->row_pointers[row], +- paletted_info_ptr->row_pointers[0], ++ memcpy(row_pointers[row], ++ row_pointers[0], + row_size); + } + +diff --git a/pagespeed/kernel/image/image_converter.cc b/pagespeed/kernel/image/image_converter.cc +index d796b5065..84b7aff74 100644 +--- a/pagespeed/kernel/image/image_converter.cc ++++ b/pagespeed/kernel/image/image_converter.cc +@@ -30,6 +30,12 @@ extern "C" { + #else + #include "third_party/libpng/src/png.h" + #endif ++ ++#ifdef USE_SYSTEM_ZLIB ++#include "zlib.h" ++#else ++#include "third_party/zlib/zlib.h" ++#endif + } // extern "C" + + #include "base/logging.h" +diff --git a/pagespeed/kernel/image/png_optimizer_test.cc b/pagespeed/kernel/image/png_optimizer_test.cc +index 9ad915aff..3faa526a8 100644 +--- a/pagespeed/kernel/image/png_optimizer_test.cc ++++ b/pagespeed/kernel/image/png_optimizer_test.cc +@@ -36,6 +36,12 @@ extern "C" { + #else + #include "third_party/libpng/src/png.h" + #endif ++ ++#ifdef USE_SYSTEM_ZLIB ++#include "zlib.h" ++#else ++#include "third_party/zlib/zlib.h" ++#endif + } + + namespace { +diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp +index cfaafee00..d96a8f74c 100644 +--- a/third_party/libpng/libpng.gyp ++++ b/third_party/libpng/libpng.gyp +@@ -22,14 +22,29 @@ + 'dependencies': [ + '../zlib/zlib.gyp:zlib', + ], ++ 'actions': [ ++ { ++ 'action_name': 'copy_libpngconf_prebuilt', ++ 'inputs' : [], ++ 'outputs': [''], ++ 'action': [ ++ 'cp', ++ '-f', ++ '<(DEPTH)/third_party/libpng/src/scripts/pnglibconf.h.prebuilt', ++ '<(DEPTH)/third_party/libpng/src/pnglibconf.h', ++ ], ++ }, ++ ], + 'msvs_guid': 'C564F145-9172-42C3-BFCB-6014CA97DBCD', + 'sources': [ ++ 'src/pngpriv.h', + 'src/png.c', + 'src/png.h', + 'src/pngconf.h', ++ 'src/pngdebug.h', + 'src/pngerror.c', +- 'src/pnggccrd.c', + 'src/pngget.c', ++ 'src/pnginfo.h', + 'src/pngmem.c', + 'src/pngpread.c', + 'src/pngread.c', +@@ -37,9 +52,8 @@ + 'src/pngrtran.c', + 'src/pngrutil.c', + 'src/pngset.c', ++ 'src/pngstruct.h', + 'src/pngtrans.c', +- 'src/pngusr.h', +- 'src/pngvcrd.c', + 'src/pngwio.c', + 'src/pngwrite.c', + 'src/pngwtran.c', +@@ -54,6 +68,12 @@ + # doesn't like that. This define tells libpng to not + # complain about our inclusion of setjmp.h. + 'PNG_SKIP_SETJMP_CHECK', ++ ++ # The PNG_FREE_ME_SUPPORTED define was dropped in libpng ++ # 1.4.0beta78, with its behavior becoming the default ++ # behavior. ++ # Hence, we define it ourselves for version >= 1.4.0 ++ 'PNG_FREE_ME_SUPPORTED', + ], + }, + 'export_dependent_settings': [ diff --git a/docker/alpine-3.8/nginx-mainline/patches/modpagespeed/pthread_nonrecursive_np.patch b/docker/alpine-3.8/nginx-mainline/patches/modpagespeed/pthread_nonrecursive_np.patch new file mode 100644 index 000000000..e5a0bb47a --- /dev/null +++ b/docker/alpine-3.8/nginx-mainline/patches/modpagespeed/pthread_nonrecursive_np.patch @@ -0,0 +1,11 @@ +--- a/pagespeed/kernel/thread/pthread_rw_lock.cc ++++ b/pagespeed/kernel/thread/pthread_rw_lock.cc +@@ -31,7 +31,7 @@ + // + // Other OS's (FreeBSD, Darwin, OpenSolaris) documentation suggests + // that they prefer writers by default. +-#ifdef linux ++#if defined(linux) && defined(__GLIBC__) + pthread_rwlockattr_setkind_np(&attr_, + PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP); + #endif diff --git a/docker/alpine-3.8/nginx-mainline/patches/modpagespeed/rename_c_symbols.patch b/docker/alpine-3.8/nginx-mainline/patches/modpagespeed/rename_c_symbols.patch new file mode 100644 index 000000000..705b70c74 --- /dev/null +++ b/docker/alpine-3.8/nginx-mainline/patches/modpagespeed/rename_c_symbols.patch @@ -0,0 +1,13 @@ +--- a/pagespeed/automatic/rename_c_symbols.sh ++++ b/pagespeed/automatic/rename_c_symbols.sh +@@ -24,8 +24,8 @@ + set -e # exit script if any command returns an error + set -u # exit the script if any variable is uninitialized + +-IN=$(readlink -f $1) +-OUT=$(readlink -f $2) ++IN=$1 ++OUT=$2 + + # Get a list of defined non-C++ symbols that are global and not weak. + # _Z is used at start of C++-mangled symbol names. diff --git a/docker/alpine-3.8/nginx-mainline/patches/modpagespeed/stack_trace_posix.patch b/docker/alpine-3.8/nginx-mainline/patches/modpagespeed/stack_trace_posix.patch new file mode 100644 index 000000000..d9ce1e38b --- /dev/null +++ b/docker/alpine-3.8/nginx-mainline/patches/modpagespeed/stack_trace_posix.patch @@ -0,0 +1,64 @@ +--- a/third_party/chromium/src/base/debug/stack_trace_posix.cc ++++ b/third_party/chromium/src/base/debug/stack_trace_posix.cc +@@ -5,7 +5,9 @@ + #include "base/debug/stack_trace.h" + + #include <errno.h> ++#if defined(HAVE_BACKTRACE) + #include <execinfo.h> ++#endif + #include <fcntl.h> + #include <signal.h> + #include <stdio.h> +@@ -64,7 +66,7 @@ + // Note: code in this function is NOT async-signal safe (std::string uses + // malloc internally). + +-#if defined(__GLIBCXX__) ++#if defined(__GLIBCXX__) && defined(HAVE_BACKTRACE) + + std::string::size_type search_from = 0; + while (search_from < text->size()) { +@@ -145,7 +147,7 @@ + + handler->HandleOutput("\n"); + } +-#else ++#elif defined(HAVE_BACKTRACE) + bool printed = false; + + // Below part is async-signal unsafe (uses malloc), so execute it only +@@ -469,23 +471,31 @@ + StackTrace::StackTrace() { + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. +- ++#if defined(HAVE_BACKTRACE) + // Though the backtrace API man page does not list any possible negative + // return values, we take no chance. + count_ = std::max(backtrace(trace_, arraysize(trace_)), 0); ++#else ++ count_ = 0; ++#endif + } + + void StackTrace::Print() const { + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. +- ++#if defined(HAVE_BACKTRACE) + PrintBacktraceOutputHandler handler; + ProcessBacktrace(trace_, count_, &handler); ++#endif + } + + void StackTrace::OutputToStream(std::ostream* os) const { ++#if !defined(HAVE_BACKTRACE) ++(*os) << "(stack trace not supported)\n"; ++#else + StreamBacktraceOutputHandler handler(os); + ProcessBacktrace(trace_, count_, &handler); ++#endif + } + + namespace internal { diff --git a/docker/alpine-3.8/nginx-stable/Dockerfile b/docker/alpine-3.8/nginx-stable/Dockerfile new file mode 100644 index 000000000..b187a1321 --- /dev/null +++ b/docker/alpine-3.8/nginx-stable/Dockerfile @@ -0,0 +1,231 @@ +ARG ALPINE_VERSION=3.8 + +######################## +# Build pagespeed psol # +######################## +FROM alpine:$ALPINE_VERSION as pagespeed + +# Check https://github.com/apache/incubator-pagespeed-mod/tags +ARG MOD_PAGESPEED_TAG=v1.13.35.2 + +RUN apk add --no-cache \ + apache2-dev \ + apr-dev \ + apr-util-dev \ + build-base \ + curl \ + gettext-dev \ + git \ + gperf \ + icu-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + libressl-dev \ + pcre-dev \ + py-setuptools \ + zlib-dev \ + ; + +WORKDIR /usr/src +RUN git clone -b ${MOD_PAGESPEED_TAG} \ + --recurse-submodules \ + --depth=1 \ + -c advice.detachedHead=false \ + -j`nproc` \ + https://github.com/apache/incubator-pagespeed-mod.git \ + modpagespeed \ + ; + +WORKDIR /usr/src/modpagespeed + +COPY patches/modpagespeed/*.patch ./ + +RUN for i in *.patch; do printf "\r\nApplying patch ${i%%.*}\r\n"; patch -p1 < $i || exit 1; done + +WORKDIR /usr/src/modpagespeed/tools/gyp +RUN ./setup.py install + +WORKDIR /usr/src/modpagespeed + +RUN build/gyp_chromium --depth=. \ + -D use_system_libs=1 \ + && \ + cd /usr/src/modpagespeed/pagespeed/automatic && \ + make psol BUILDTYPE=Release \ + CFLAGS+="-I/usr/include/apr-1" \ + CXXFLAGS+="-I/usr/include/apr-1 -DUCHAR_TYPE=uint16_t" \ + -j`nproc` \ + ; + +RUN mkdir -p /usr/src/ngxpagespeed/psol/lib/Release/linux/x64 && \ + mkdir -p /usr/src/ngxpagespeed/psol/include/out/Release && \ + cp -R out/Release/obj /usr/src/ngxpagespeed/psol/include/out/Release/ && \ + cp -R pagespeed/automatic/pagespeed_automatic.a /usr/src/ngxpagespeed/psol/lib/Release/linux/x64/ && \ + cp -R net \ + pagespeed \ + testing \ + third_party \ + url \ + /usr/src/ngxpagespeed/psol/include/ \ + ; + + +########################################## +# Build Nginx with support for PageSpeed # +########################################## +FROM alpine:$ALPINE_VERSION AS nginx + +# Check https://github.com/apache/incubator-pagespeed-ngx/tags +ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable + +# Check http://nginx.org/en/download.html for the latest version. +ARG NGINX_VERSION=1.14.0 +ARG NGINX_PGPKEY=520A9993A1C052F8 +ARG NGINX_BUILD_CONFIG="\ + --prefix=/etc/nginx \ + --sbin-path=/usr/sbin/nginx \ + --modules-path=/usr/lib/nginx/modules \ + --conf-path=/etc/nginx/nginx.conf \ + --error-log-path=/var/log/nginx/error.log \ + --http-log-path=/var/log/nginx/access.log \ + --pid-path=/var/run/nginx.pid \ + --lock-path=/var/run/nginx.lock \ + --http-client-body-temp-path=/var/cache/nginx/client_temp \ + --http-proxy-temp-path=/var/cache/nginx/proxy_temp \ + --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp \ + --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp \ + --http-scgi-temp-path=/var/cache/nginx/scgi_temp \ + --user=nginx \ + --group=nginx \ + --with-http_ssl_module \ + --with-http_realip_module \ + --with-http_addition_module \ + --with-http_sub_module \ + --with-http_dav_module \ + --with-http_flv_module \ + --with-http_mp4_module \ + --with-http_gunzip_module \ + --with-http_gzip_static_module \ + --with-http_random_index_module \ + --with-http_secure_link_module \ + --with-http_stub_status_module \ + --with-http_auth_request_module \ + --with-http_xslt_module=dynamic \ + --with-http_image_filter_module=dynamic \ + --with-http_geoip_module=dynamic \ + --with-threads \ + --with-stream \ + --with-stream_ssl_module \ + --with-stream_ssl_preread_module \ + --with-stream_realip_module \ + --with-stream_geoip_module=dynamic \ + --with-http_slice_module \ + --with-mail \ + --with-mail_ssl_module \ + --with-compat \ + --with-file-aio \ + --with-http_v2_module \ + " + +RUN apk add --no-cache \ + apr-dev \ + apr-util-dev \ + build-base \ + ca-certificates \ + gd-dev \ + geoip-dev \ + git \ + gnupg \ + icu-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + libxslt-dev \ + linux-headers \ + libressl-dev \ + pcre-dev \ + tar \ + zlib-dev \ + ; + +WORKDIR /usr/src +RUN git clone -b ${NGX_PAGESPEED_TAG} \ + --recurse-submodules \ + --shallow-submodules \ + --depth=1 \ + -c advice.detachedHead=false \ + -j`nproc` \ + https://github.com/apache/incubator-pagespeed-ngx.git \ + ngxpagespeed \ + ; + +RUN wget https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz \ + https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz.asc && \ + (gpg --keyserver ha.pool.sks-keyservers.net --keyserver-options timeout=10 --recv-keys ${NGINX_PGPKEY} || \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --keyserver-options timeout=10 --recv-keys ${NGINX_PGPKEY} || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --keyserver-options timeout=10 --recv-keys $NGINX_PGPKEY} ) && \ + gpg --trusted-key ${NGINX_PGPKEY} --verify nginx-${NGINX_VERSION}.tar.gz.asc + +COPY --from=pagespeed /usr/src/ngxpagespeed /usr/src/ngxpagespeed/ + +WORKDIR /usr/src/nginx + +RUN tar zxf ../nginx-${NGINX_VERSION}.tar.gz --strip-components=1 -C . && \ + ./configure \ + ${NGINX_BUILD_CONFIG} \ + --add-module=/usr/src/ngxpagespeed \ + --with-ld-opt="-Wl,-z,relro,--start-group -lapr-1 -laprutil-1 -licudata -licuuc -lpng -lturbojpeg -ljpeg" \ + && \ + make install -j`nproc` + +RUN rm -rf /etc/nginx/html/ && \ + mkdir /etc/nginx/conf.d/ && \ + mkdir -p /usr/share/nginx/html/ && \ + sed -i 's|^</body>|<p><a href="https://www.ngxpagespeed.com/";><img src="pagespeed.png" title="Nginx module for rewriting web pages to reduce latency and bandwidth" /></a></p>\n</body>|' html/index.html && \ + install -m644 html/index.html /usr/share/nginx/html/ && \ + install -m644 html/50x.html /usr/share/nginx/html/ && \ + ln -s ../../usr/lib/nginx/modules /etc/nginx/modules && \ + strip /usr/sbin/nginx* \ + /usr/lib/nginx/modules/*.so \ + ; + +COPY conf/nginx.conf /etc/nginx/nginx.conf +COPY conf/nginx.vh.default.conf /etc/nginx/conf.d/default.conf +COPY pagespeed.png /usr/share/nginx/html/ + + +########################################## +# Combine everything with minimal layers # +########################################## +FROM alpine:$ALPINE_VERSION +LABEL maintainer="Nico Berlee <nico.ber...@on2it.net>" \ + version.mod-pagespeed="1.13.35.2" \ + version.nginx="1.14.0" \ + version.ngx-pagespeed="1.13.35.2" + +COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin +COPY --from=nginx /usr/sbin/nginx /usr/sbin/nginx +COPY --from=nginx /usr/lib/nginx/modules/ /usr/lib/nginx/modules/ +COPY --from=nginx /etc/nginx /etc/nginx +COPY --from=nginx /usr/share/nginx/html/ /usr/share/nginx/html/ + +RUN apk --no-cache upgrade && \ + scanelf --needed --nobanner --format '%n#p' /usr/sbin/nginx /usr/lib/nginx/modules/*.so /usr/local/bin/envsubst \ + | tr ',' '\n' \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + | xargs apk add --no-cache \ + && \ + apk add --no-cache tzdata + +RUN addgroup -S nginx && \ + adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx && \ + install -g nginx -o nginx -d /var/cache/ngx_pagespeed && \ + mkdir -p /var/log/nginx && \ + ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log + +EXPOSE 80 + +STOPSIGNAL SIGTERM + +CMD ["/usr/sbin/nginx", "-g", "daemon off;"] + diff --git a/docker/alpine-3.8/nginx-stable/conf/nginx.conf b/docker/alpine-3.8/nginx-stable/conf/nginx.conf new file mode 100644 index 000000000..e4bad8dbc --- /dev/null +++ b/docker/alpine-3.8/nginx-stable/conf/nginx.conf @@ -0,0 +1,32 @@ + +user nginx; +worker_processes 1; + +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + include /etc/nginx/conf.d/*.conf; +} diff --git a/docker/alpine-3.8/nginx-stable/conf/nginx.vh.default.conf b/docker/alpine-3.8/nginx-stable/conf/nginx.vh.default.conf new file mode 100644 index 000000000..479c979c2 --- /dev/null +++ b/docker/alpine-3.8/nginx-stable/conf/nginx.vh.default.conf @@ -0,0 +1,57 @@ +server { + listen 80; + server_name localhost; + + #charset koi8-r; + #access_log /var/log/nginx/host.access.log main; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + pagespeed on; + + # Needs to exist and be writable by nginx. Use tmpfs for best performance. + pagespeed FileCachePath /var/cache/ngx_pagespeed; + + # Ensure requests for pagespeed optimized resources go to the pagespeed handler + # and no extraneous headers get set. + location ~ "\.pagespeed\.([a-z]\.)?[a-z]{2}\.[^.]{10}\.[^.]+" { + add_header "" ""; + } + location ~ "^/pagespeed_static/" { } + location ~ "^/ngx_pagespeed_beacon$" { } + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} +} + diff --git a/docker/alpine-3.8/nginx-stable/pagespeed.png b/docker/alpine-3.8/nginx-stable/pagespeed.png new file mode 100644 index 000000000..bd7a2b7f4 Binary files /dev/null and b/docker/alpine-3.8/nginx-stable/pagespeed.png differ diff --git a/docker/alpine-3.8/nginx-stable/patches/modpagespeed/automatic_makefile.patch b/docker/alpine-3.8/nginx-stable/patches/modpagespeed/automatic_makefile.patch new file mode 100644 index 000000000..992a37bfd --- /dev/null +++ b/docker/alpine-3.8/nginx-stable/patches/modpagespeed/automatic_makefile.patch @@ -0,0 +1,31 @@ +--- a/pagespeed/automatic/Makefile ++++ b/pagespeed/automatic/Makefile +@@ -146,8 +146,6 @@ + pagespeed/libpagespeed_thread.a \ + pagespeed/libpthread_system.a \ + pagespeed/libutil.a \ +- third_party/apr/libapr.a \ +- third_party/aprutil/libaprutil.a \ + third_party/base64/libbase64.a \ + third_party/chromium/src/base/third_party/dynamic_annotations/libdynamic_annotations.a \ + third_party/css_parser/libcss_parser.a \ +@@ -163,18 +161,11 @@ + third_party/grpc/libgrpc_core.a \ + third_party/grpc/libgrpc_cpp.a \ + third_party/hiredis/libhiredis.a \ +- third_party/icu/libicudata.a \ +- third_party/icu/libicuuc.a \ + third_party/jsoncpp/libjsoncpp.a \ +- third_party/libjpeg_turbo/libjpeg.a \ +- third_party/libjpeg_turbo/src/libjpeg_turbo.a \ +- third_party/libpng/libpng.a \ + third_party/optipng/libopngreduc.a \ + third_party/protobuf/libprotobuf_full_do_not_use.a \ + third_party/re2/libre2.a \ +- third_party/serf/libopenssl.a \ + third_party/serf/libserf.a \ +- third_party/zlib/libzlib.a \ + url/liburl_lib.a + + # The 'gclient' build flow uses 'xcodebuild' on Mac and 'make' on Linux. + diff --git a/docker/alpine-3.8/nginx-stable/patches/modpagespeed/libpng16.patch b/docker/alpine-3.8/nginx-stable/patches/modpagespeed/libpng16.patch new file mode 100644 index 000000000..24aa63c2f --- /dev/null +++ b/docker/alpine-3.8/nginx-stable/patches/modpagespeed/libpng16.patch @@ -0,0 +1,141 @@ +From 7ea8d5fc141c7067c54ffa2b9fbc552c15089ca6 Mon Sep 17 00:00:00 2001 +From: ashishk-1 <ashis...@gdbtech.in> +Date: Thu, 18 Jan 2018 22:14:05 +0530 +Subject: [PATCH] Upgrading libpng library to version 1.6 (#1724) + +--- + net/instaweb/rewriter/image.cc | 8 ++++++++ + pagespeed/kernel/image/gif_reader.cc | 4 ++-- + pagespeed/kernel/image/image_converter.cc | 6 ++++++ + pagespeed/kernel/image/png_optimizer_test.cc | 6 ++++++ + third_party/libpng/libpng.gyp | 26 +++++++++++++++++++++++--- + third_party/libpng/src | 2 +- + 6 files changed, 46 insertions(+), 6 deletions(-) + +diff --git a/net/instaweb/rewriter/image.cc b/net/instaweb/rewriter/image.cc +index 4f631182a..bb67bba35 100644 +--- a/net/instaweb/rewriter/image.cc ++++ b/net/instaweb/rewriter/image.cc +@@ -21,6 +21,14 @@ + #include <algorithm> + #include <cstddef> + ++extern "C" { ++#ifdef USE_SYSTEM_ZLIB ++#include "zlib.h" ++#else ++#include "third_party/zlib/zlib.h" ++#endif ++} // extern "C" ++ + #include "base/logging.h" + #include "net/instaweb/rewriter/cached_result.pb.h" + #include "net/instaweb/rewriter/public/image_data_lookup.h" +diff --git a/pagespeed/kernel/image/gif_reader.cc b/pagespeed/kernel/image/gif_reader.cc +index 7de69b3d7..bb0bc9cfc 100644 +--- a/pagespeed/kernel/image/gif_reader.cc ++++ b/pagespeed/kernel/image/gif_reader.cc +@@ -411,8 +411,8 @@ bool ReadGifToPng(GifFileType* gif_file, + png_uint_32 height = png_get_image_height(paletted_png_ptr, + paletted_info_ptr); + for (png_uint_32 row = 1; row < height; ++row) { +- memcpy(paletted_info_ptr->row_pointers[row], +- paletted_info_ptr->row_pointers[0], ++ memcpy(row_pointers[row], ++ row_pointers[0], + row_size); + } + +diff --git a/pagespeed/kernel/image/image_converter.cc b/pagespeed/kernel/image/image_converter.cc +index d796b5065..84b7aff74 100644 +--- a/pagespeed/kernel/image/image_converter.cc ++++ b/pagespeed/kernel/image/image_converter.cc +@@ -30,6 +30,12 @@ extern "C" { + #else + #include "third_party/libpng/src/png.h" + #endif ++ ++#ifdef USE_SYSTEM_ZLIB ++#include "zlib.h" ++#else ++#include "third_party/zlib/zlib.h" ++#endif + } // extern "C" + + #include "base/logging.h" +diff --git a/pagespeed/kernel/image/png_optimizer_test.cc b/pagespeed/kernel/image/png_optimizer_test.cc +index 9ad915aff..3faa526a8 100644 +--- a/pagespeed/kernel/image/png_optimizer_test.cc ++++ b/pagespeed/kernel/image/png_optimizer_test.cc +@@ -36,6 +36,12 @@ extern "C" { + #else + #include "third_party/libpng/src/png.h" + #endif ++ ++#ifdef USE_SYSTEM_ZLIB ++#include "zlib.h" ++#else ++#include "third_party/zlib/zlib.h" ++#endif + } + + namespace { +diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp +index cfaafee00..d96a8f74c 100644 +--- a/third_party/libpng/libpng.gyp ++++ b/third_party/libpng/libpng.gyp +@@ -22,14 +22,29 @@ + 'dependencies': [ + '../zlib/zlib.gyp:zlib', + ], ++ 'actions': [ ++ { ++ 'action_name': 'copy_libpngconf_prebuilt', ++ 'inputs' : [], ++ 'outputs': [''], ++ 'action': [ ++ 'cp', ++ '-f', ++ '<(DEPTH)/third_party/libpng/src/scripts/pnglibconf.h.prebuilt', ++ '<(DEPTH)/third_party/libpng/src/pnglibconf.h', ++ ], ++ }, ++ ], + 'msvs_guid': 'C564F145-9172-42C3-BFCB-6014CA97DBCD', + 'sources': [ ++ 'src/pngpriv.h', + 'src/png.c', + 'src/png.h', + 'src/pngconf.h', ++ 'src/pngdebug.h', + 'src/pngerror.c', +- 'src/pnggccrd.c', + 'src/pngget.c', ++ 'src/pnginfo.h', + 'src/pngmem.c', + 'src/pngpread.c', + 'src/pngread.c', +@@ -37,9 +52,8 @@ + 'src/pngrtran.c', + 'src/pngrutil.c', + 'src/pngset.c', ++ 'src/pngstruct.h', + 'src/pngtrans.c', +- 'src/pngusr.h', +- 'src/pngvcrd.c', + 'src/pngwio.c', + 'src/pngwrite.c', + 'src/pngwtran.c', +@@ -54,6 +68,12 @@ + # doesn't like that. This define tells libpng to not + # complain about our inclusion of setjmp.h. + 'PNG_SKIP_SETJMP_CHECK', ++ ++ # The PNG_FREE_ME_SUPPORTED define was dropped in libpng ++ # 1.4.0beta78, with its behavior becoming the default ++ # behavior. ++ # Hence, we define it ourselves for version >= 1.4.0 ++ 'PNG_FREE_ME_SUPPORTED', + ], + }, + 'export_dependent_settings': [ diff --git a/docker/alpine-3.8/nginx-stable/patches/modpagespeed/pthread_nonrecursive_np.patch b/docker/alpine-3.8/nginx-stable/patches/modpagespeed/pthread_nonrecursive_np.patch new file mode 100644 index 000000000..e5a0bb47a --- /dev/null +++ b/docker/alpine-3.8/nginx-stable/patches/modpagespeed/pthread_nonrecursive_np.patch @@ -0,0 +1,11 @@ +--- a/pagespeed/kernel/thread/pthread_rw_lock.cc ++++ b/pagespeed/kernel/thread/pthread_rw_lock.cc +@@ -31,7 +31,7 @@ + // + // Other OS's (FreeBSD, Darwin, OpenSolaris) documentation suggests + // that they prefer writers by default. +-#ifdef linux ++#if defined(linux) && defined(__GLIBC__) + pthread_rwlockattr_setkind_np(&attr_, + PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP); + #endif diff --git a/docker/alpine-3.8/nginx-stable/patches/modpagespeed/rename_c_symbols.patch b/docker/alpine-3.8/nginx-stable/patches/modpagespeed/rename_c_symbols.patch new file mode 100644 index 000000000..705b70c74 --- /dev/null +++ b/docker/alpine-3.8/nginx-stable/patches/modpagespeed/rename_c_symbols.patch @@ -0,0 +1,13 @@ +--- a/pagespeed/automatic/rename_c_symbols.sh ++++ b/pagespeed/automatic/rename_c_symbols.sh +@@ -24,8 +24,8 @@ + set -e # exit script if any command returns an error + set -u # exit the script if any variable is uninitialized + +-IN=$(readlink -f $1) +-OUT=$(readlink -f $2) ++IN=$1 ++OUT=$2 + + # Get a list of defined non-C++ symbols that are global and not weak. + # _Z is used at start of C++-mangled symbol names. diff --git a/docker/alpine-3.8/nginx-stable/patches/modpagespeed/stack_trace_posix.patch b/docker/alpine-3.8/nginx-stable/patches/modpagespeed/stack_trace_posix.patch new file mode 100644 index 000000000..d9ce1e38b --- /dev/null +++ b/docker/alpine-3.8/nginx-stable/patches/modpagespeed/stack_trace_posix.patch @@ -0,0 +1,64 @@ +--- a/third_party/chromium/src/base/debug/stack_trace_posix.cc ++++ b/third_party/chromium/src/base/debug/stack_trace_posix.cc +@@ -5,7 +5,9 @@ + #include "base/debug/stack_trace.h" + + #include <errno.h> ++#if defined(HAVE_BACKTRACE) + #include <execinfo.h> ++#endif + #include <fcntl.h> + #include <signal.h> + #include <stdio.h> +@@ -64,7 +66,7 @@ + // Note: code in this function is NOT async-signal safe (std::string uses + // malloc internally). + +-#if defined(__GLIBCXX__) ++#if defined(__GLIBCXX__) && defined(HAVE_BACKTRACE) + + std::string::size_type search_from = 0; + while (search_from < text->size()) { +@@ -145,7 +147,7 @@ + + handler->HandleOutput("\n"); + } +-#else ++#elif defined(HAVE_BACKTRACE) + bool printed = false; + + // Below part is async-signal unsafe (uses malloc), so execute it only +@@ -469,23 +471,31 @@ + StackTrace::StackTrace() { + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. +- ++#if defined(HAVE_BACKTRACE) + // Though the backtrace API man page does not list any possible negative + // return values, we take no chance. + count_ = std::max(backtrace(trace_, arraysize(trace_)), 0); ++#else ++ count_ = 0; ++#endif + } + + void StackTrace::Print() const { + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. +- ++#if defined(HAVE_BACKTRACE) + PrintBacktraceOutputHandler handler; + ProcessBacktrace(trace_, count_, &handler); ++#endif + } + + void StackTrace::OutputToStream(std::ostream* os) const { ++#if !defined(HAVE_BACKTRACE) ++(*os) << "(stack trace not supported)\n"; ++#else + StreamBacktraceOutputHandler handler(os); + ProcessBacktrace(trace_, count_, &handler); ++#endif + } + + namespace internal { diff --git a/docker/alpine-edge/nginx-mainline/Dockerfile b/docker/alpine-edge/nginx-mainline/Dockerfile new file mode 100644 index 000000000..75c8c6a5f --- /dev/null +++ b/docker/alpine-edge/nginx-mainline/Dockerfile @@ -0,0 +1,230 @@ +ARG ALPINE_VERSION=edge + +######################## +# Build pagespeed psol # +######################## +FROM alpine:$ALPINE_VERSION as pagespeed + +# Check https://github.com/apache/incubator-pagespeed-mod/tags +ARG MOD_PAGESPEED_TAG=v1.13.35.2 + +RUN apk add --no-cache \ + apache2-dev \ + apr-dev \ + apr-util-dev \ + build-base \ + curl \ + gettext-dev \ + git \ + gperf \ + icu-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + libressl-dev \ + pcre-dev \ + py-setuptools \ + zlib-dev \ + ; + +WORKDIR /usr/src +RUN git clone -b ${MOD_PAGESPEED_TAG} \ + --recurse-submodules \ + --depth=1 \ + -c advice.detachedHead=false \ + -j`nproc` \ + https://github.com/apache/incubator-pagespeed-mod.git \ + modpagespeed \ + ; + +WORKDIR /usr/src/modpagespeed + +COPY patches/modpagespeed/*.patch ./ + +RUN for i in *.patch; do printf "\r\nApplying patch ${i%%.*}\r\n"; patch -p1 < $i || exit 1; done + +WORKDIR /usr/src/modpagespeed/tools/gyp +RUN ./setup.py install + +WORKDIR /usr/src/modpagespeed + +RUN build/gyp_chromium --depth=. \ + -D use_system_libs=1 \ + && \ + cd /usr/src/modpagespeed/pagespeed/automatic && \ + make psol BUILDTYPE=Release \ + CFLAGS+="-I/usr/include/apr-1" \ + CXXFLAGS+="-I/usr/include/apr-1 -DUCHAR_TYPE=uint16_t" \ + -j`nproc` \ + ; + +RUN mkdir -p /usr/src/ngxpagespeed/psol/lib/Release/linux/x64 && \ + mkdir -p /usr/src/ngxpagespeed/psol/include/out/Release && \ + cp -R out/Release/obj /usr/src/ngxpagespeed/psol/include/out/Release/ && \ + cp -R pagespeed/automatic/pagespeed_automatic.a /usr/src/ngxpagespeed/psol/lib/Release/linux/x64/ && \ + cp -R net \ + pagespeed \ + testing \ + third_party \ + url \ + /usr/src/ngxpagespeed/psol/include/ \ + ; + + +########################################## +# Build Nginx with support for PageSpeed # +########################################## +FROM alpine:$ALPINE_VERSION AS nginx + +# Check https://github.com/apache/incubator-pagespeed-ngx/tags +ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable + +# Check http://nginx.org/en/download.html for the latest version. +ARG NGINX_VERSION=1.15.4 +ARG NGINX_PGPKEY=520A9993A1C052F8 +ARG NGINX_BUILD_CONFIG="\ + --prefix=/etc/nginx \ + --sbin-path=/usr/sbin/nginx \ + --modules-path=/usr/lib/nginx/modules \ + --conf-path=/etc/nginx/nginx.conf \ + --error-log-path=/var/log/nginx/error.log \ + --http-log-path=/var/log/nginx/access.log \ + --pid-path=/var/run/nginx.pid \ + --lock-path=/var/run/nginx.lock \ + --http-client-body-temp-path=/var/cache/nginx/client_temp \ + --http-proxy-temp-path=/var/cache/nginx/proxy_temp \ + --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp \ + --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp \ + --http-scgi-temp-path=/var/cache/nginx/scgi_temp \ + --user=nginx \ + --group=nginx \ + --with-http_ssl_module \ + --with-http_realip_module \ + --with-http_addition_module \ + --with-http_sub_module \ + --with-http_dav_module \ + --with-http_flv_module \ + --with-http_mp4_module \ + --with-http_gunzip_module \ + --with-http_gzip_static_module \ + --with-http_random_index_module \ + --with-http_secure_link_module \ + --with-http_stub_status_module \ + --with-http_auth_request_module \ + --with-http_xslt_module=dynamic \ + --with-http_image_filter_module=dynamic \ + --with-http_geoip_module=dynamic \ + --with-threads \ + --with-stream \ + --with-stream_ssl_module \ + --with-stream_ssl_preread_module \ + --with-stream_realip_module \ + --with-stream_geoip_module=dynamic \ + --with-http_slice_module \ + --with-mail \ + --with-mail_ssl_module \ + --with-compat \ + --with-file-aio \ + --with-http_v2_module \ + " + +RUN apk add --no-cache \ + apr-dev \ + apr-util-dev \ + build-base \ + ca-certificates \ + gd-dev \ + geoip-dev \ + git \ + gnupg \ + icu-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + libxslt-dev \ + linux-headers \ + libressl-dev \ + pcre-dev \ + tar \ + zlib-dev \ + ; + +WORKDIR /usr/src +RUN git clone -b ${NGX_PAGESPEED_TAG} \ + --recurse-submodules \ + --shallow-submodules \ + --depth=1 \ + -c advice.detachedHead=false \ + -j`nproc` \ + https://github.com/apache/incubator-pagespeed-ngx.git \ + ngxpagespeed \ + ; + +RUN wget https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz \ + https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz.asc && \ + (gpg --keyserver ha.pool.sks-keyservers.net --keyserver-options timeout=10 --recv-keys ${NGINX_PGPKEY} || \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --keyserver-options timeout=10 --recv-keys ${NGINX_PGPKEY} || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --keyserver-options timeout=10 --recv-keys $NGINX_PGPKEY} ) && \ + gpg --trusted-key ${NGINX_PGPKEY} --verify nginx-${NGINX_VERSION}.tar.gz.asc + +COPY --from=pagespeed /usr/src/ngxpagespeed /usr/src/ngxpagespeed/ + +WORKDIR /usr/src/nginx + +RUN tar zxf ../nginx-${NGINX_VERSION}.tar.gz --strip-components=1 -C . && \ + ./configure \ + ${NGINX_BUILD_CONFIG} \ + --add-module=/usr/src/ngxpagespeed \ + --with-ld-opt="-Wl,-z,relro,--start-group -lapr-1 -laprutil-1 -licudata -licuuc -lpng -lturbojpeg -ljpeg" \ + && \ + make install -j`nproc` + +RUN rm -rf /etc/nginx/html/ && \ + mkdir /etc/nginx/conf.d/ && \ + mkdir -p /usr/share/nginx/html/ && \ + sed -i 's|^</body>|<p><a href="https://www.ngxpagespeed.com/";><img src="pagespeed.png" title="Nginx module for rewriting web pages to reduce latency and bandwidth" /></a></p>\n</body>|' html/index.html && \ + install -m644 html/index.html /usr/share/nginx/html/ && \ + install -m644 html/50x.html /usr/share/nginx/html/ && \ + ln -s ../../usr/lib/nginx/modules /etc/nginx/modules && \ + strip /usr/sbin/nginx* \ + /usr/lib/nginx/modules/*.so \ + ; + +COPY conf/nginx.conf /etc/nginx/nginx.conf +COPY conf/nginx.vh.default.conf /etc/nginx/conf.d/default.conf +COPY pagespeed.png /usr/share/nginx/html/ + + +########################################## +# Combine everything with minimal layers # +########################################## +FROM alpine:$ALPINE_VERSION +LABEL maintainer="Nico Berlee <nico.ber...@on2it.net>" \ + version.mod-pagespeed="1.13.35.2" \ + version.nginx="1.15.4" \ + version.ngx-pagespeed="1.13.35.2" + +COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin +COPY --from=nginx /usr/sbin/nginx /usr/sbin/nginx +COPY --from=nginx /usr/lib/nginx/modules/ /usr/lib/nginx/modules/ +COPY --from=nginx /etc/nginx /etc/nginx +COPY --from=nginx /usr/share/nginx/html/ /usr/share/nginx/html/ + +RUN apk --no-cache upgrade && \ + scanelf --needed --nobanner --format '%n#p' /usr/sbin/nginx /usr/lib/nginx/modules/*.so /usr/local/bin/envsubst \ + | tr ',' '\n' \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + | xargs apk add --no-cache \ + && \ + apk add --no-cache tzdata + +RUN addgroup -S nginx && \ + adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx && \ + install -g nginx -o nginx -d /var/cache/ngx_pagespeed && \ + mkdir -p /var/log/nginx && \ + ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log + +EXPOSE 80 + +STOPSIGNAL SIGTERM + +CMD ["/usr/sbin/nginx", "-g", "daemon off;"] diff --git a/docker/alpine-edge/nginx-mainline/conf/nginx.conf b/docker/alpine-edge/nginx-mainline/conf/nginx.conf new file mode 100644 index 000000000..e4bad8dbc --- /dev/null +++ b/docker/alpine-edge/nginx-mainline/conf/nginx.conf @@ -0,0 +1,32 @@ + +user nginx; +worker_processes 1; + +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + include /etc/nginx/conf.d/*.conf; +} diff --git a/docker/alpine-edge/nginx-mainline/conf/nginx.vh.default.conf b/docker/alpine-edge/nginx-mainline/conf/nginx.vh.default.conf new file mode 100644 index 000000000..479c979c2 --- /dev/null +++ b/docker/alpine-edge/nginx-mainline/conf/nginx.vh.default.conf @@ -0,0 +1,57 @@ +server { + listen 80; + server_name localhost; + + #charset koi8-r; + #access_log /var/log/nginx/host.access.log main; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + pagespeed on; + + # Needs to exist and be writable by nginx. Use tmpfs for best performance. + pagespeed FileCachePath /var/cache/ngx_pagespeed; + + # Ensure requests for pagespeed optimized resources go to the pagespeed handler + # and no extraneous headers get set. + location ~ "\.pagespeed\.([a-z]\.)?[a-z]{2}\.[^.]{10}\.[^.]+" { + add_header "" ""; + } + location ~ "^/pagespeed_static/" { } + location ~ "^/ngx_pagespeed_beacon$" { } + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} +} + diff --git a/docker/alpine-edge/nginx-mainline/pagespeed.png b/docker/alpine-edge/nginx-mainline/pagespeed.png new file mode 100644 index 000000000..bd7a2b7f4 Binary files /dev/null and b/docker/alpine-edge/nginx-mainline/pagespeed.png differ diff --git a/docker/alpine-edge/nginx-mainline/patches/modpagespeed/automatic_makefile.patch b/docker/alpine-edge/nginx-mainline/patches/modpagespeed/automatic_makefile.patch new file mode 100644 index 000000000..992a37bfd --- /dev/null +++ b/docker/alpine-edge/nginx-mainline/patches/modpagespeed/automatic_makefile.patch @@ -0,0 +1,31 @@ +--- a/pagespeed/automatic/Makefile ++++ b/pagespeed/automatic/Makefile +@@ -146,8 +146,6 @@ + pagespeed/libpagespeed_thread.a \ + pagespeed/libpthread_system.a \ + pagespeed/libutil.a \ +- third_party/apr/libapr.a \ +- third_party/aprutil/libaprutil.a \ + third_party/base64/libbase64.a \ + third_party/chromium/src/base/third_party/dynamic_annotations/libdynamic_annotations.a \ + third_party/css_parser/libcss_parser.a \ +@@ -163,18 +161,11 @@ + third_party/grpc/libgrpc_core.a \ + third_party/grpc/libgrpc_cpp.a \ + third_party/hiredis/libhiredis.a \ +- third_party/icu/libicudata.a \ +- third_party/icu/libicuuc.a \ + third_party/jsoncpp/libjsoncpp.a \ +- third_party/libjpeg_turbo/libjpeg.a \ +- third_party/libjpeg_turbo/src/libjpeg_turbo.a \ +- third_party/libpng/libpng.a \ + third_party/optipng/libopngreduc.a \ + third_party/protobuf/libprotobuf_full_do_not_use.a \ + third_party/re2/libre2.a \ +- third_party/serf/libopenssl.a \ + third_party/serf/libserf.a \ +- third_party/zlib/libzlib.a \ + url/liburl_lib.a + + # The 'gclient' build flow uses 'xcodebuild' on Mac and 'make' on Linux. + diff --git a/docker/alpine-edge/nginx-mainline/patches/modpagespeed/libpng16.patch b/docker/alpine-edge/nginx-mainline/patches/modpagespeed/libpng16.patch new file mode 100644 index 000000000..24aa63c2f --- /dev/null +++ b/docker/alpine-edge/nginx-mainline/patches/modpagespeed/libpng16.patch @@ -0,0 +1,141 @@ +From 7ea8d5fc141c7067c54ffa2b9fbc552c15089ca6 Mon Sep 17 00:00:00 2001 +From: ashishk-1 <ashis...@gdbtech.in> +Date: Thu, 18 Jan 2018 22:14:05 +0530 +Subject: [PATCH] Upgrading libpng library to version 1.6 (#1724) + +--- + net/instaweb/rewriter/image.cc | 8 ++++++++ + pagespeed/kernel/image/gif_reader.cc | 4 ++-- + pagespeed/kernel/image/image_converter.cc | 6 ++++++ + pagespeed/kernel/image/png_optimizer_test.cc | 6 ++++++ + third_party/libpng/libpng.gyp | 26 +++++++++++++++++++++++--- + third_party/libpng/src | 2 +- + 6 files changed, 46 insertions(+), 6 deletions(-) + +diff --git a/net/instaweb/rewriter/image.cc b/net/instaweb/rewriter/image.cc +index 4f631182a..bb67bba35 100644 +--- a/net/instaweb/rewriter/image.cc ++++ b/net/instaweb/rewriter/image.cc +@@ -21,6 +21,14 @@ + #include <algorithm> + #include <cstddef> + ++extern "C" { ++#ifdef USE_SYSTEM_ZLIB ++#include "zlib.h" ++#else ++#include "third_party/zlib/zlib.h" ++#endif ++} // extern "C" ++ + #include "base/logging.h" + #include "net/instaweb/rewriter/cached_result.pb.h" + #include "net/instaweb/rewriter/public/image_data_lookup.h" +diff --git a/pagespeed/kernel/image/gif_reader.cc b/pagespeed/kernel/image/gif_reader.cc +index 7de69b3d7..bb0bc9cfc 100644 +--- a/pagespeed/kernel/image/gif_reader.cc ++++ b/pagespeed/kernel/image/gif_reader.cc +@@ -411,8 +411,8 @@ bool ReadGifToPng(GifFileType* gif_file, + png_uint_32 height = png_get_image_height(paletted_png_ptr, + paletted_info_ptr); + for (png_uint_32 row = 1; row < height; ++row) { +- memcpy(paletted_info_ptr->row_pointers[row], +- paletted_info_ptr->row_pointers[0], ++ memcpy(row_pointers[row], ++ row_pointers[0], + row_size); + } + +diff --git a/pagespeed/kernel/image/image_converter.cc b/pagespeed/kernel/image/image_converter.cc +index d796b5065..84b7aff74 100644 +--- a/pagespeed/kernel/image/image_converter.cc ++++ b/pagespeed/kernel/image/image_converter.cc +@@ -30,6 +30,12 @@ extern "C" { + #else + #include "third_party/libpng/src/png.h" + #endif ++ ++#ifdef USE_SYSTEM_ZLIB ++#include "zlib.h" ++#else ++#include "third_party/zlib/zlib.h" ++#endif + } // extern "C" + + #include "base/logging.h" +diff --git a/pagespeed/kernel/image/png_optimizer_test.cc b/pagespeed/kernel/image/png_optimizer_test.cc +index 9ad915aff..3faa526a8 100644 +--- a/pagespeed/kernel/image/png_optimizer_test.cc ++++ b/pagespeed/kernel/image/png_optimizer_test.cc +@@ -36,6 +36,12 @@ extern "C" { + #else + #include "third_party/libpng/src/png.h" + #endif ++ ++#ifdef USE_SYSTEM_ZLIB ++#include "zlib.h" ++#else ++#include "third_party/zlib/zlib.h" ++#endif + } + + namespace { +diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp +index cfaafee00..d96a8f74c 100644 +--- a/third_party/libpng/libpng.gyp ++++ b/third_party/libpng/libpng.gyp +@@ -22,14 +22,29 @@ + 'dependencies': [ + '../zlib/zlib.gyp:zlib', + ], ++ 'actions': [ ++ { ++ 'action_name': 'copy_libpngconf_prebuilt', ++ 'inputs' : [], ++ 'outputs': [''], ++ 'action': [ ++ 'cp', ++ '-f', ++ '<(DEPTH)/third_party/libpng/src/scripts/pnglibconf.h.prebuilt', ++ '<(DEPTH)/third_party/libpng/src/pnglibconf.h', ++ ], ++ }, ++ ], + 'msvs_guid': 'C564F145-9172-42C3-BFCB-6014CA97DBCD', + 'sources': [ ++ 'src/pngpriv.h', + 'src/png.c', + 'src/png.h', + 'src/pngconf.h', ++ 'src/pngdebug.h', + 'src/pngerror.c', +- 'src/pnggccrd.c', + 'src/pngget.c', ++ 'src/pnginfo.h', + 'src/pngmem.c', + 'src/pngpread.c', + 'src/pngread.c', +@@ -37,9 +52,8 @@ + 'src/pngrtran.c', + 'src/pngrutil.c', + 'src/pngset.c', ++ 'src/pngstruct.h', + 'src/pngtrans.c', +- 'src/pngusr.h', +- 'src/pngvcrd.c', + 'src/pngwio.c', + 'src/pngwrite.c', + 'src/pngwtran.c', +@@ -54,6 +68,12 @@ + # doesn't like that. This define tells libpng to not + # complain about our inclusion of setjmp.h. + 'PNG_SKIP_SETJMP_CHECK', ++ ++ # The PNG_FREE_ME_SUPPORTED define was dropped in libpng ++ # 1.4.0beta78, with its behavior becoming the default ++ # behavior. ++ # Hence, we define it ourselves for version >= 1.4.0 ++ 'PNG_FREE_ME_SUPPORTED', + ], + }, + 'export_dependent_settings': [ diff --git a/docker/alpine-edge/nginx-mainline/patches/modpagespeed/pthread_nonrecursive_np.patch b/docker/alpine-edge/nginx-mainline/patches/modpagespeed/pthread_nonrecursive_np.patch new file mode 100644 index 000000000..e5a0bb47a --- /dev/null +++ b/docker/alpine-edge/nginx-mainline/patches/modpagespeed/pthread_nonrecursive_np.patch @@ -0,0 +1,11 @@ +--- a/pagespeed/kernel/thread/pthread_rw_lock.cc ++++ b/pagespeed/kernel/thread/pthread_rw_lock.cc +@@ -31,7 +31,7 @@ + // + // Other OS's (FreeBSD, Darwin, OpenSolaris) documentation suggests + // that they prefer writers by default. +-#ifdef linux ++#if defined(linux) && defined(__GLIBC__) + pthread_rwlockattr_setkind_np(&attr_, + PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP); + #endif diff --git a/docker/alpine-edge/nginx-mainline/patches/modpagespeed/rename_c_symbols.patch b/docker/alpine-edge/nginx-mainline/patches/modpagespeed/rename_c_symbols.patch new file mode 100644 index 000000000..705b70c74 --- /dev/null +++ b/docker/alpine-edge/nginx-mainline/patches/modpagespeed/rename_c_symbols.patch @@ -0,0 +1,13 @@ +--- a/pagespeed/automatic/rename_c_symbols.sh ++++ b/pagespeed/automatic/rename_c_symbols.sh +@@ -24,8 +24,8 @@ + set -e # exit script if any command returns an error + set -u # exit the script if any variable is uninitialized + +-IN=$(readlink -f $1) +-OUT=$(readlink -f $2) ++IN=$1 ++OUT=$2 + + # Get a list of defined non-C++ symbols that are global and not weak. + # _Z is used at start of C++-mangled symbol names. diff --git a/docker/alpine-edge/nginx-mainline/patches/modpagespeed/stack_trace_posix.patch b/docker/alpine-edge/nginx-mainline/patches/modpagespeed/stack_trace_posix.patch new file mode 100644 index 000000000..d9ce1e38b --- /dev/null +++ b/docker/alpine-edge/nginx-mainline/patches/modpagespeed/stack_trace_posix.patch @@ -0,0 +1,64 @@ +--- a/third_party/chromium/src/base/debug/stack_trace_posix.cc ++++ b/third_party/chromium/src/base/debug/stack_trace_posix.cc +@@ -5,7 +5,9 @@ + #include "base/debug/stack_trace.h" + + #include <errno.h> ++#if defined(HAVE_BACKTRACE) + #include <execinfo.h> ++#endif + #include <fcntl.h> + #include <signal.h> + #include <stdio.h> +@@ -64,7 +66,7 @@ + // Note: code in this function is NOT async-signal safe (std::string uses + // malloc internally). + +-#if defined(__GLIBCXX__) ++#if defined(__GLIBCXX__) && defined(HAVE_BACKTRACE) + + std::string::size_type search_from = 0; + while (search_from < text->size()) { +@@ -145,7 +147,7 @@ + + handler->HandleOutput("\n"); + } +-#else ++#elif defined(HAVE_BACKTRACE) + bool printed = false; + + // Below part is async-signal unsafe (uses malloc), so execute it only +@@ -469,23 +471,31 @@ + StackTrace::StackTrace() { + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. +- ++#if defined(HAVE_BACKTRACE) + // Though the backtrace API man page does not list any possible negative + // return values, we take no chance. + count_ = std::max(backtrace(trace_, arraysize(trace_)), 0); ++#else ++ count_ = 0; ++#endif + } + + void StackTrace::Print() const { + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. +- ++#if defined(HAVE_BACKTRACE) + PrintBacktraceOutputHandler handler; + ProcessBacktrace(trace_, count_, &handler); ++#endif + } + + void StackTrace::OutputToStream(std::ostream* os) const { ++#if !defined(HAVE_BACKTRACE) ++(*os) << "(stack trace not supported)\n"; ++#else + StreamBacktraceOutputHandler handler(os); + ProcessBacktrace(trace_, count_, &handler); ++#endif + } + + namespace internal { diff --git a/docker/alpine-edge/nginx-stable/Dockerfile b/docker/alpine-edge/nginx-stable/Dockerfile new file mode 100644 index 000000000..f34bf7165 --- /dev/null +++ b/docker/alpine-edge/nginx-stable/Dockerfile @@ -0,0 +1,235 @@ +ARG ALPINE_VERSION=edge + +######################## +# Build pagespeed psol # +######################## +FROM alpine:$ALPINE_VERSION as pagespeed + +# Check https://github.com/apache/incubator-pagespeed-mod/tags +ARG MOD_PAGESPEED_TAG=v1.13.35.2 + +RUN apk add --no-cache \ + apache2-dev \ + apr-dev \ + apr-util-dev \ + build-base \ + curl \ + gettext-dev \ + git \ + gperf \ + icu-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + libressl-dev \ + pcre-dev \ + py-setuptools \ + zlib-dev \ + ; + +WORKDIR /usr/src +RUN git clone -b ${MOD_PAGESPEED_TAG} \ + --recurse-submodules \ + --depth=1 \ + -c advice.detachedHead=false \ + -j`nproc` \ + https://github.com/apache/incubator-pagespeed-mod.git \ + modpagespeed \ + ; + +WORKDIR /usr/src/modpagespeed + +COPY patches/modpagespeed/*.patch ./ + +RUN for i in *.patch; do printf "\r\nApplying patch ${i%%.*}\r\n"; patch -p1 < $i || exit 1; done + +WORKDIR /usr/src/modpagespeed/tools/gyp +RUN ./setup.py install + +WORKDIR /usr/src/modpagespeed + +RUN build/gyp_chromium --depth=. \ + -D use_system_libs=1 \ + && \ + cd /usr/src/modpagespeed/pagespeed/automatic && \ + make psol BUILDTYPE=Release \ + CFLAGS+="-I/usr/include/apr-1" \ + CXXFLAGS+="-I/usr/include/apr-1 -DUCHAR_TYPE=uint16_t" \ + -j`nproc` \ + ; + +RUN mkdir -p /usr/src/ngxpagespeed/psol/lib/Release/linux/x64 && \ + mkdir -p /usr/src/ngxpagespeed/psol/include/out/Release && \ + cp -R out/Release/obj /usr/src/ngxpagespeed/psol/include/out/Release/ && \ + cp -R pagespeed/automatic/pagespeed_automatic.a /usr/src/ngxpagespeed/psol/lib/Release/linux/x64/ && \ + cp -R net \ + pagespeed \ + testing \ + third_party \ + url \ + /usr/src/ngxpagespeed/psol/include/ \ + ; + + +########################################## +# Build Nginx with support for PageSpeed # +########################################## +FROM alpine:$ALPINE_VERSION AS nginx + +# Check https://github.com/apache/incubator-pagespeed-ngx/tags +ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable + +# Check http://nginx.org/en/download.html for the latest version. +ARG NGINX_VERSION=1.14.0 +ARG NGINX_PGPKEY=520A9993A1C052F8 +ARG NGINX_BUILD_CONFIG="\ + --prefix=/etc/nginx \ + --sbin-path=/usr/sbin/nginx \ + --modules-path=/usr/lib/nginx/modules \ + --conf-path=/etc/nginx/nginx.conf \ + --error-log-path=/var/log/nginx/error.log \ + --http-log-path=/var/log/nginx/access.log \ + --pid-path=/var/run/nginx.pid \ + --lock-path=/var/run/nginx.lock \ + --http-client-body-temp-path=/var/cache/nginx/client_temp \ + --http-proxy-temp-path=/var/cache/nginx/proxy_temp \ + --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp \ + --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp \ + --http-scgi-temp-path=/var/cache/nginx/scgi_temp \ + --user=nginx \ + --group=nginx \ + --with-http_ssl_module \ + --with-http_realip_module \ + --with-http_addition_module \ + --with-http_sub_module \ + --with-http_dav_module \ + --with-http_flv_module \ + --with-http_mp4_module \ + --with-http_gunzip_module \ + --with-http_gzip_static_module \ + --with-http_random_index_module \ + --with-http_secure_link_module \ + --with-http_stub_status_module \ + --with-http_auth_request_module \ + --with-http_xslt_module=dynamic \ + --with-http_image_filter_module=dynamic \ + --with-http_geoip_module=dynamic \ + --with-threads \ + --with-stream \ + --with-stream_ssl_module \ + --with-stream_ssl_preread_module \ + --with-stream_realip_module \ + --with-stream_geoip_module=dynamic \ + --with-http_slice_module \ + --with-mail \ + --with-mail_ssl_module \ + --with-compat \ + --with-file-aio \ + --with-http_v2_module \ + " + +RUN apk add --no-cache \ + apr-dev \ + apr-util-dev \ + build-base \ + ca-certificates \ + gd-dev \ + geoip-dev \ + git \ + gnupg \ + icu-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + libxslt-dev \ + linux-headers \ + libressl-dev \ + pcre-dev \ + tar \ + zlib-dev \ + ; + +WORKDIR /usr/src +RUN git clone -b ${NGX_PAGESPEED_TAG} \ + --recurse-submodules \ + --shallow-submodules \ + --depth=1 \ + -c advice.detachedHead=false \ + -j`nproc` \ + https://github.com/apache/incubator-pagespeed-ngx.git \ + ngxpagespeed \ + ; + +RUN wget https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz \ + https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz.asc && \ + (gpg --keyserver ha.pool.sks-keyservers.net --keyserver-options timeout=10 --recv-keys ${NGINX_PGPKEY} || \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --keyserver-options timeout=10 --recv-keys ${NGINX_PGPKEY} || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --keyserver-options timeout=10 --recv-keys $NGINX_PGPKEY} ) && \ + gpg --trusted-key ${NGINX_PGPKEY} --verify nginx-${NGINX_VERSION}.tar.gz.asc + +COPY --from=pagespeed /usr/src/ngxpagespeed /usr/src/ngxpagespeed/ + +WORKDIR /usr/src/nginx + +RUN tar zxf ../nginx-${NGINX_VERSION}.tar.gz --strip-components=1 -C . + +COPY patches/ngx/*.patch ./ + +RUN for i in *.patch; do printf "\r\nApplying patch ${i%%.*}\r\n"; patch -p1 < $i || exit 1; done + +RUN ./configure \ + ${NGINX_BUILD_CONFIG} \ + --add-module=/usr/src/ngxpagespeed \ + --with-ld-opt="-Wl,-z,relro,--start-group -lapr-1 -laprutil-1 -licudata -licuuc -lpng -lturbojpeg -ljpeg" \ + && \ + make install -j`nproc` + +RUN rm -rf /etc/nginx/html/ && \ + mkdir /etc/nginx/conf.d/ && \ + mkdir -p /usr/share/nginx/html/ && \ + sed -i 's|^</body>|<p><a href="https://www.ngxpagespeed.com/";><img src="pagespeed.png" title="Nginx module for rewriting web pages to reduce latency and bandwidth" /></a></p>\n</body>|' html/index.html && \ + install -m644 html/index.html /usr/share/nginx/html/ && \ + install -m644 html/50x.html /usr/share/nginx/html/ && \ + ln -s ../../usr/lib/nginx/modules /etc/nginx/modules && \ + strip /usr/sbin/nginx* \ + /usr/lib/nginx/modules/*.so \ + ; + +COPY conf/nginx.conf /etc/nginx/nginx.conf +COPY conf/nginx.vh.default.conf /etc/nginx/conf.d/default.conf +COPY pagespeed.png /usr/share/nginx/html/ + + +########################################## +# Combine everything with minimal layers # +########################################## +FROM alpine:$ALPINE_VERSION +LABEL maintainer="Nico Berlee <nico.ber...@on2it.net>" \ + version.mod-pagespeed="1.13.35.2" \ + version.nginx="1.14.0" \ + version.ngx-pagespeed="1.13.35.2" + +COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin +COPY --from=nginx /usr/sbin/nginx /usr/sbin/nginx +COPY --from=nginx /usr/lib/nginx/modules/ /usr/lib/nginx/modules/ +COPY --from=nginx /etc/nginx /etc/nginx +COPY --from=nginx /usr/share/nginx/html/ /usr/share/nginx/html/ + +RUN apk --no-cache upgrade && \ + scanelf --needed --nobanner --format '%n#p' /usr/sbin/nginx /usr/lib/nginx/modules/*.so /usr/local/bin/envsubst \ + | tr ',' '\n' \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + | xargs apk add --no-cache \ + && \ + apk add --no-cache tzdata + +RUN addgroup -S nginx && \ + adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx && \ + install -g nginx -o nginx -d /var/cache/ngx_pagespeed && \ + mkdir -p /var/log/nginx && \ + ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log + +EXPOSE 80 + +STOPSIGNAL SIGTERM + +CMD ["/usr/sbin/nginx", "-g", "daemon off;"] diff --git a/docker/alpine-edge/nginx-stable/conf/nginx.conf b/docker/alpine-edge/nginx-stable/conf/nginx.conf new file mode 100644 index 000000000..e4bad8dbc --- /dev/null +++ b/docker/alpine-edge/nginx-stable/conf/nginx.conf @@ -0,0 +1,32 @@ + +user nginx; +worker_processes 1; + +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + include /etc/nginx/conf.d/*.conf; +} diff --git a/docker/alpine-edge/nginx-stable/conf/nginx.vh.default.conf b/docker/alpine-edge/nginx-stable/conf/nginx.vh.default.conf new file mode 100644 index 000000000..479c979c2 --- /dev/null +++ b/docker/alpine-edge/nginx-stable/conf/nginx.vh.default.conf @@ -0,0 +1,57 @@ +server { + listen 80; + server_name localhost; + + #charset koi8-r; + #access_log /var/log/nginx/host.access.log main; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + pagespeed on; + + # Needs to exist and be writable by nginx. Use tmpfs for best performance. + pagespeed FileCachePath /var/cache/ngx_pagespeed; + + # Ensure requests for pagespeed optimized resources go to the pagespeed handler + # and no extraneous headers get set. + location ~ "\.pagespeed\.([a-z]\.)?[a-z]{2}\.[^.]{10}\.[^.]+" { + add_header "" ""; + } + location ~ "^/pagespeed_static/" { } + location ~ "^/ngx_pagespeed_beacon$" { } + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} +} + diff --git a/docker/alpine-edge/nginx-stable/pagespeed.png b/docker/alpine-edge/nginx-stable/pagespeed.png new file mode 100644 index 000000000..bd7a2b7f4 Binary files /dev/null and b/docker/alpine-edge/nginx-stable/pagespeed.png differ diff --git a/docker/alpine-edge/nginx-stable/patches/modpagespeed/automatic_makefile.patch b/docker/alpine-edge/nginx-stable/patches/modpagespeed/automatic_makefile.patch new file mode 100644 index 000000000..992a37bfd --- /dev/null +++ b/docker/alpine-edge/nginx-stable/patches/modpagespeed/automatic_makefile.patch @@ -0,0 +1,31 @@ +--- a/pagespeed/automatic/Makefile ++++ b/pagespeed/automatic/Makefile +@@ -146,8 +146,6 @@ + pagespeed/libpagespeed_thread.a \ + pagespeed/libpthread_system.a \ + pagespeed/libutil.a \ +- third_party/apr/libapr.a \ +- third_party/aprutil/libaprutil.a \ + third_party/base64/libbase64.a \ + third_party/chromium/src/base/third_party/dynamic_annotations/libdynamic_annotations.a \ + third_party/css_parser/libcss_parser.a \ +@@ -163,18 +161,11 @@ + third_party/grpc/libgrpc_core.a \ + third_party/grpc/libgrpc_cpp.a \ + third_party/hiredis/libhiredis.a \ +- third_party/icu/libicudata.a \ +- third_party/icu/libicuuc.a \ + third_party/jsoncpp/libjsoncpp.a \ +- third_party/libjpeg_turbo/libjpeg.a \ +- third_party/libjpeg_turbo/src/libjpeg_turbo.a \ +- third_party/libpng/libpng.a \ + third_party/optipng/libopngreduc.a \ + third_party/protobuf/libprotobuf_full_do_not_use.a \ + third_party/re2/libre2.a \ +- third_party/serf/libopenssl.a \ + third_party/serf/libserf.a \ +- third_party/zlib/libzlib.a \ + url/liburl_lib.a + + # The 'gclient' build flow uses 'xcodebuild' on Mac and 'make' on Linux. + diff --git a/docker/alpine-edge/nginx-stable/patches/modpagespeed/libpng16.patch b/docker/alpine-edge/nginx-stable/patches/modpagespeed/libpng16.patch new file mode 100644 index 000000000..24aa63c2f --- /dev/null +++ b/docker/alpine-edge/nginx-stable/patches/modpagespeed/libpng16.patch @@ -0,0 +1,141 @@ +From 7ea8d5fc141c7067c54ffa2b9fbc552c15089ca6 Mon Sep 17 00:00:00 2001 +From: ashishk-1 <ashis...@gdbtech.in> +Date: Thu, 18 Jan 2018 22:14:05 +0530 +Subject: [PATCH] Upgrading libpng library to version 1.6 (#1724) + +--- + net/instaweb/rewriter/image.cc | 8 ++++++++ + pagespeed/kernel/image/gif_reader.cc | 4 ++-- + pagespeed/kernel/image/image_converter.cc | 6 ++++++ + pagespeed/kernel/image/png_optimizer_test.cc | 6 ++++++ + third_party/libpng/libpng.gyp | 26 +++++++++++++++++++++++--- + third_party/libpng/src | 2 +- + 6 files changed, 46 insertions(+), 6 deletions(-) + +diff --git a/net/instaweb/rewriter/image.cc b/net/instaweb/rewriter/image.cc +index 4f631182a..bb67bba35 100644 +--- a/net/instaweb/rewriter/image.cc ++++ b/net/instaweb/rewriter/image.cc +@@ -21,6 +21,14 @@ + #include <algorithm> + #include <cstddef> + ++extern "C" { ++#ifdef USE_SYSTEM_ZLIB ++#include "zlib.h" ++#else ++#include "third_party/zlib/zlib.h" ++#endif ++} // extern "C" ++ + #include "base/logging.h" + #include "net/instaweb/rewriter/cached_result.pb.h" + #include "net/instaweb/rewriter/public/image_data_lookup.h" +diff --git a/pagespeed/kernel/image/gif_reader.cc b/pagespeed/kernel/image/gif_reader.cc +index 7de69b3d7..bb0bc9cfc 100644 +--- a/pagespeed/kernel/image/gif_reader.cc ++++ b/pagespeed/kernel/image/gif_reader.cc +@@ -411,8 +411,8 @@ bool ReadGifToPng(GifFileType* gif_file, + png_uint_32 height = png_get_image_height(paletted_png_ptr, + paletted_info_ptr); + for (png_uint_32 row = 1; row < height; ++row) { +- memcpy(paletted_info_ptr->row_pointers[row], +- paletted_info_ptr->row_pointers[0], ++ memcpy(row_pointers[row], ++ row_pointers[0], + row_size); + } + +diff --git a/pagespeed/kernel/image/image_converter.cc b/pagespeed/kernel/image/image_converter.cc +index d796b5065..84b7aff74 100644 +--- a/pagespeed/kernel/image/image_converter.cc ++++ b/pagespeed/kernel/image/image_converter.cc +@@ -30,6 +30,12 @@ extern "C" { + #else + #include "third_party/libpng/src/png.h" + #endif ++ ++#ifdef USE_SYSTEM_ZLIB ++#include "zlib.h" ++#else ++#include "third_party/zlib/zlib.h" ++#endif + } // extern "C" + + #include "base/logging.h" +diff --git a/pagespeed/kernel/image/png_optimizer_test.cc b/pagespeed/kernel/image/png_optimizer_test.cc +index 9ad915aff..3faa526a8 100644 +--- a/pagespeed/kernel/image/png_optimizer_test.cc ++++ b/pagespeed/kernel/image/png_optimizer_test.cc +@@ -36,6 +36,12 @@ extern "C" { + #else + #include "third_party/libpng/src/png.h" + #endif ++ ++#ifdef USE_SYSTEM_ZLIB ++#include "zlib.h" ++#else ++#include "third_party/zlib/zlib.h" ++#endif + } + + namespace { +diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp +index cfaafee00..d96a8f74c 100644 +--- a/third_party/libpng/libpng.gyp ++++ b/third_party/libpng/libpng.gyp +@@ -22,14 +22,29 @@ + 'dependencies': [ + '../zlib/zlib.gyp:zlib', + ], ++ 'actions': [ ++ { ++ 'action_name': 'copy_libpngconf_prebuilt', ++ 'inputs' : [], ++ 'outputs': [''], ++ 'action': [ ++ 'cp', ++ '-f', ++ '<(DEPTH)/third_party/libpng/src/scripts/pnglibconf.h.prebuilt', ++ '<(DEPTH)/third_party/libpng/src/pnglibconf.h', ++ ], ++ }, ++ ], + 'msvs_guid': 'C564F145-9172-42C3-BFCB-6014CA97DBCD', + 'sources': [ ++ 'src/pngpriv.h', + 'src/png.c', + 'src/png.h', + 'src/pngconf.h', ++ 'src/pngdebug.h', + 'src/pngerror.c', +- 'src/pnggccrd.c', + 'src/pngget.c', ++ 'src/pnginfo.h', + 'src/pngmem.c', + 'src/pngpread.c', + 'src/pngread.c', +@@ -37,9 +52,8 @@ + 'src/pngrtran.c', + 'src/pngrutil.c', + 'src/pngset.c', ++ 'src/pngstruct.h', + 'src/pngtrans.c', +- 'src/pngusr.h', +- 'src/pngvcrd.c', + 'src/pngwio.c', + 'src/pngwrite.c', + 'src/pngwtran.c', +@@ -54,6 +68,12 @@ + # doesn't like that. This define tells libpng to not + # complain about our inclusion of setjmp.h. + 'PNG_SKIP_SETJMP_CHECK', ++ ++ # The PNG_FREE_ME_SUPPORTED define was dropped in libpng ++ # 1.4.0beta78, with its behavior becoming the default ++ # behavior. ++ # Hence, we define it ourselves for version >= 1.4.0 ++ 'PNG_FREE_ME_SUPPORTED', + ], + }, + 'export_dependent_settings': [ diff --git a/docker/alpine-edge/nginx-stable/patches/modpagespeed/pthread_nonrecursive_np.patch b/docker/alpine-edge/nginx-stable/patches/modpagespeed/pthread_nonrecursive_np.patch new file mode 100644 index 000000000..e5a0bb47a --- /dev/null +++ b/docker/alpine-edge/nginx-stable/patches/modpagespeed/pthread_nonrecursive_np.patch @@ -0,0 +1,11 @@ +--- a/pagespeed/kernel/thread/pthread_rw_lock.cc ++++ b/pagespeed/kernel/thread/pthread_rw_lock.cc +@@ -31,7 +31,7 @@ + // + // Other OS's (FreeBSD, Darwin, OpenSolaris) documentation suggests + // that they prefer writers by default. +-#ifdef linux ++#if defined(linux) && defined(__GLIBC__) + pthread_rwlockattr_setkind_np(&attr_, + PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP); + #endif diff --git a/docker/alpine-edge/nginx-stable/patches/modpagespeed/rename_c_symbols.patch b/docker/alpine-edge/nginx-stable/patches/modpagespeed/rename_c_symbols.patch new file mode 100644 index 000000000..705b70c74 --- /dev/null +++ b/docker/alpine-edge/nginx-stable/patches/modpagespeed/rename_c_symbols.patch @@ -0,0 +1,13 @@ +--- a/pagespeed/automatic/rename_c_symbols.sh ++++ b/pagespeed/automatic/rename_c_symbols.sh +@@ -24,8 +24,8 @@ + set -e # exit script if any command returns an error + set -u # exit the script if any variable is uninitialized + +-IN=$(readlink -f $1) +-OUT=$(readlink -f $2) ++IN=$1 ++OUT=$2 + + # Get a list of defined non-C++ symbols that are global and not weak. + # _Z is used at start of C++-mangled symbol names. diff --git a/docker/alpine-edge/nginx-stable/patches/modpagespeed/stack_trace_posix.patch b/docker/alpine-edge/nginx-stable/patches/modpagespeed/stack_trace_posix.patch new file mode 100644 index 000000000..d9ce1e38b --- /dev/null +++ b/docker/alpine-edge/nginx-stable/patches/modpagespeed/stack_trace_posix.patch @@ -0,0 +1,64 @@ +--- a/third_party/chromium/src/base/debug/stack_trace_posix.cc ++++ b/third_party/chromium/src/base/debug/stack_trace_posix.cc +@@ -5,7 +5,9 @@ + #include "base/debug/stack_trace.h" + + #include <errno.h> ++#if defined(HAVE_BACKTRACE) + #include <execinfo.h> ++#endif + #include <fcntl.h> + #include <signal.h> + #include <stdio.h> +@@ -64,7 +66,7 @@ + // Note: code in this function is NOT async-signal safe (std::string uses + // malloc internally). + +-#if defined(__GLIBCXX__) ++#if defined(__GLIBCXX__) && defined(HAVE_BACKTRACE) + + std::string::size_type search_from = 0; + while (search_from < text->size()) { +@@ -145,7 +147,7 @@ + + handler->HandleOutput("\n"); + } +-#else ++#elif defined(HAVE_BACKTRACE) + bool printed = false; + + // Below part is async-signal unsafe (uses malloc), so execute it only +@@ -469,23 +471,31 @@ + StackTrace::StackTrace() { + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. +- ++#if defined(HAVE_BACKTRACE) + // Though the backtrace API man page does not list any possible negative + // return values, we take no chance. + count_ = std::max(backtrace(trace_, arraysize(trace_)), 0); ++#else ++ count_ = 0; ++#endif + } + + void StackTrace::Print() const { + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. +- ++#if defined(HAVE_BACKTRACE) + PrintBacktraceOutputHandler handler; + ProcessBacktrace(trace_, count_, &handler); ++#endif + } + + void StackTrace::OutputToStream(std::ostream* os) const { ++#if !defined(HAVE_BACKTRACE) ++(*os) << "(stack trace not supported)\n"; ++#else + StreamBacktraceOutputHandler handler(os); + ProcessBacktrace(trace_, count_, &handler); ++#endif + } + + namespace internal { diff --git a/docker/alpine-edge/nginx-stable/patches/ngx/gcc8.patch b/docker/alpine-edge/nginx-stable/patches/ngx/gcc8.patch new file mode 100644 index 000000000..14cf88b2c --- /dev/null +++ b/docker/alpine-edge/nginx-stable/patches/ngx/gcc8.patch @@ -0,0 +1,190 @@ +diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c +index bc43f53ed9..3eec1b7dd0 100644 +--- a/src/http/modules/ngx_http_fastcgi_module.c ++++ b/src/http/modules/ngx_http_fastcgi_module.c +@@ -3264,7 +3264,8 @@ ngx_http_fastcgi_init_params(ngx_conf_t *cf, ngx_http_fastcgi_loc_conf_t *conf, + return NGX_ERROR; + } + +- copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code; ++ copy->code = (ngx_http_script_code_pt) (void *) ++ ngx_http_script_copy_len_code; + copy->len = src[i].key.len; + + copy = ngx_array_push_n(params->lengths, +@@ -3273,7 +3274,8 @@ ngx_http_fastcgi_init_params(ngx_conf_t *cf, ngx_http_fastcgi_loc_conf_t *conf, + return NGX_ERROR; + } + +- copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code; ++ copy->code = (ngx_http_script_code_pt) (void *) ++ ngx_http_script_copy_len_code; + copy->len = src[i].skip_empty; + + +diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c +index 837ad9a2ea..300d927047 100644 +--- a/src/http/modules/ngx_http_grpc_module.c ++++ b/src/http/modules/ngx_http_grpc_module.c +@@ -4389,7 +4389,8 @@ ngx_http_grpc_init_headers(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *conf, + return NGX_ERROR; + } + +- copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code; ++ copy->code = (ngx_http_script_code_pt) (void *) ++ ngx_http_script_copy_len_code; + copy->len = src[i].key.len; + + size = (sizeof(ngx_http_script_copy_code_t) +diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c +index c9ad638df9..e7f829d653 100644 +--- a/src/http/modules/ngx_http_proxy_module.c ++++ b/src/http/modules/ngx_http_proxy_module.c +@@ -3493,7 +3493,8 @@ ngx_http_proxy_init_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf, + return NGX_ERROR; + } + +- copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code; ++ copy->code = (ngx_http_script_code_pt) (void *) ++ ngx_http_script_copy_len_code; + copy->len = src[i].key.len; + + size = (sizeof(ngx_http_script_copy_code_t) +diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c +index 3fb227b28c..9bd45bd136 100644 +--- a/src/http/modules/ngx_http_scgi_module.c ++++ b/src/http/modules/ngx_http_scgi_module.c +@@ -1724,7 +1724,8 @@ ngx_http_scgi_init_params(ngx_conf_t *cf, ngx_http_scgi_loc_conf_t *conf, + return NGX_ERROR; + } + +- copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code; ++ copy->code = (ngx_http_script_code_pt) (void *) ++ ngx_http_script_copy_len_code; + copy->len = src[i].key.len + 1; + + copy = ngx_array_push_n(params->lengths, +@@ -1733,7 +1734,8 @@ ngx_http_scgi_init_params(ngx_conf_t *cf, ngx_http_scgi_loc_conf_t *conf, + return NGX_ERROR; + } + +- copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code; ++ copy->code = (ngx_http_script_code_pt) (void *) ++ ngx_http_script_copy_len_code; + copy->len = src[i].skip_empty; + + +diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c +index 124da4db56..238bcf8a3b 100644 +--- a/src/http/modules/ngx_http_uwsgi_module.c ++++ b/src/http/modules/ngx_http_uwsgi_module.c +@@ -1987,7 +1987,8 @@ ngx_http_uwsgi_init_params(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *conf, + return NGX_ERROR; + } + +- copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code; ++ copy->code = (ngx_http_script_code_pt) (void *) ++ ngx_http_script_copy_len_code; + copy->len = src[i].key.len; + + copy = ngx_array_push_n(params->lengths, +@@ -1996,7 +1997,8 @@ ngx_http_uwsgi_init_params(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *conf, + return NGX_ERROR; + } + +- copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code; ++ copy->code = (ngx_http_script_code_pt) (void *) ++ ngx_http_script_copy_len_code; + copy->len = src[i].skip_empty; + + +diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c +index 96f3ec6965..1a87735617 100644 +--- a/src/http/ngx_http_script.c ++++ b/src/http/ngx_http_script.c +@@ -695,7 +695,8 @@ ngx_http_script_add_copy_code(ngx_http_script_compile_t *sc, ngx_str_t *value, + return NGX_ERROR; + } + +- code->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code; ++ code->code = (ngx_http_script_code_pt) (void *) ++ ngx_http_script_copy_len_code; + code->len = len; + + size = (sizeof(ngx_http_script_copy_code_t) + len + sizeof(uintptr_t) - 1) +@@ -784,7 +785,8 @@ ngx_http_script_add_var_code(ngx_http_script_compile_t *sc, ngx_str_t *name) + return NGX_ERROR; + } + +- code->code = (ngx_http_script_code_pt) ngx_http_script_copy_var_len_code; ++ code->code = (ngx_http_script_code_pt) (void *) ++ ngx_http_script_copy_var_len_code; + code->index = (uintptr_t) index; + + code = ngx_http_script_add_code(*sc->values, +@@ -1178,8 +1180,8 @@ ngx_http_script_add_capture_code(ngx_http_script_compile_t *sc, ngx_uint_t n) + return NGX_ERROR; + } + +- code->code = (ngx_http_script_code_pt) +- ngx_http_script_copy_capture_len_code; ++ code->code = (ngx_http_script_code_pt) (void *) ++ ngx_http_script_copy_capture_len_code; + code->n = 2 * n; + + +@@ -1293,7 +1295,8 @@ ngx_http_script_add_full_name_code(ngx_http_script_compile_t *sc) + return NGX_ERROR; + } + +- code->code = (ngx_http_script_code_pt) ngx_http_script_full_name_len_code; ++ code->code = (ngx_http_script_code_pt) (void *) ++ ngx_http_script_full_name_len_code; + code->conf_prefix = sc->conf_prefix; + + code = ngx_http_script_add_code(*sc->values, +diff --git a/src/stream/ngx_stream_script.c b/src/stream/ngx_stream_script.c +index aa555ca2c1..b00e7086f7 100644 +--- a/src/stream/ngx_stream_script.c ++++ b/src/stream/ngx_stream_script.c +@@ -587,7 +587,8 @@ ngx_stream_script_add_copy_code(ngx_stream_script_compile_t *sc, + return NGX_ERROR; + } + +- code->code = (ngx_stream_script_code_pt) ngx_stream_script_copy_len_code; ++ code->code = (ngx_stream_script_code_pt) (void *) ++ ngx_stream_script_copy_len_code; + code->len = len; + + size = (sizeof(ngx_stream_script_copy_code_t) + len + sizeof(uintptr_t) - 1) +@@ -677,8 +678,8 @@ ngx_stream_script_add_var_code(ngx_stream_script_compile_t *sc, ngx_str_t *name) + return NGX_ERROR; + } + +- code->code = (ngx_stream_script_code_pt) +- ngx_stream_script_copy_var_len_code; ++ code->code = (ngx_stream_script_code_pt) (void *) ++ ngx_stream_script_copy_var_len_code; + code->index = (uintptr_t) index; + + code = ngx_stream_script_add_code(*sc->values, +@@ -767,8 +768,8 @@ ngx_stream_script_add_capture_code(ngx_stream_script_compile_t *sc, + return NGX_ERROR; + } + +- code->code = (ngx_stream_script_code_pt) +- ngx_stream_script_copy_capture_len_code; ++ code->code = (ngx_stream_script_code_pt) (void *) ++ ngx_stream_script_copy_capture_len_code; + code->n = 2 * n; + + +@@ -859,7 +860,7 @@ ngx_stream_script_add_full_name_code(ngx_stream_script_compile_t *sc) + return NGX_ERROR; + } + +- code->code = (ngx_stream_script_code_pt) ++ code->code = (ngx_stream_script_code_pt) (void *) + ngx_stream_script_full_name_len_code; + code->conf_prefix = sc->conf_prefix; + ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
