Merge tag '1.32.0' into branches/packaging1.32.0-1

Unit 1.32.0 release.

1 files changed, 0 insertions, 89 deletions

diff --git a/pkg/docker/Dockerfile.node18 b/pkg/docker/Dockerfile.node18
deleted file mode 100644
index 4ac18847..00000000
--- a/pkg/docker/Dockerfile.node18
+++ /dev/null
@@ -1,89 +0,0 @@
-FROM node:18-bullseye
-
-LABEL org.opencontainers.image.title="Unit (node18)"
-LABEL org.opencontainers.image.description="Official build of Unit for Docker."
-LABEL org.opencontainers.image.url="https://unit.nginx.org"
-LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
-LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
-LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.31.1"
-
-RUN set -ex \
-    && savedAptMark="$(apt-mark showmanual)" \
-    && apt-get update \
-    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \
-    && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
-    && mkdir -p /usr/src/unit \
-    && cd /usr/src/unit \
-    && hg clone -u 1.31.1-1 https://hg.nginx.org/unit \
-    && cd unit \
-    && NCPU="$(getconf _NPROCESSORS_ONLN)" \
-    && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
-    && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
-    && LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
-    && CONFIGURE_ARGS_MODULES="--prefix=/usr \
-                --statedir=/var/lib/unit \
-                --control=unix:/var/run/control.unit.sock \
-                --runstatedir=/var/run \
-                --pid=/var/run/unit.pid \
-                --logdir=/var/log \
-                --log=/var/log/unit.log \
-                --tmpdir=/var/tmp \
-                --user=unit \
-                --group=unit \
-                --openssl \
-                --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
-    && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
-                --njs" \
-    && make -j $NCPU -C pkg/contrib .njs \
-    && export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
-    && make -j $NCPU unitd \
-    && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \
-    && make clean \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \
-    && make -j $NCPU unitd \
-    && install -pm755 build/sbin/unitd /usr/sbin/unitd \
-    && make clean \
-    && npm -g install node-gyp \
-    && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
-    && ./configure nodejs --node-gyp=/usr/local/bin/node-gyp \
-    && make -j $NCPU node node-install libunit-install \
-    && make clean \
-    && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
-    && ./configure nodejs --node-gyp=/usr/local/bin/node-gyp \
-    && make -j $NCPU node node-install libunit-install \
-    && cd \
-    && rm -rf /usr/src/unit \
-    && for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
-        ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
-       done \
-    && apt-mark showmanual | xargs apt-mark auto > /dev/null \
-    && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
-    && rm -rf /root/.cache/ && rm -rf /root/.npm \
-    && mkdir -p /var/lib/unit/ \
-    && mkdir -p /docker-entrypoint.d/ \
-    && groupadd --gid 999 unit \
-    && useradd \
-         --uid 999 \
-         --gid unit \
-         --no-create-home \
-         --home /nonexistent \
-         --comment "unit user" \
-         --shell /bin/false \
-         unit \
-    && apt-get update \
-    && apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
-    && apt-get purge -y --auto-remove build-essential \
-    && rm -rf /var/lib/apt/lists/* \
-    && rm -f /requirements.apt \
-    && ln -sf /dev/stdout /var/log/unit.log
-
-COPY docker-entrypoint.sh /usr/local/bin/
-COPY welcome.* /usr/share/unit/welcome/
-
-STOPSIGNAL SIGTERM
-
-ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-EXPOSE 80
-CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]