diff options
| author | Konstantin Pavlov <thresh@nginx.com> | 2022-06-02 16:51:49 +0400 |
|---|---|---|
| committer | Konstantin Pavlov <thresh@nginx.com> | 2022-06-02 16:51:49 +0400 |
| commit | d9fddee1dbfc1f5d49c8f40386289d7188030952 (patch) | |
| tree | 842a62b343ac33eba10e7a426a10b55bb1c46aed /pkg/docker/Dockerfile.node16 | |
| parent | 420395ee2e7cd464e157c49bea3d74f15bf25f30 (diff) | |
| parent | 0d48fe73c4450901622373e35f6ff3a944ec13d6 (diff) | |
| download | unit-d9fddee1dbfc1f5d49c8f40386289d7188030952.tar.gz unit-d9fddee1dbfc1f5d49c8f40386289d7188030952.tar.bz2 | |
Merged with the default branch.1.27.0-1
Diffstat (limited to 'pkg/docker/Dockerfile.node16')
| -rw-r--r-- | pkg/docker/Dockerfile.node16 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkg/docker/Dockerfile.node16 b/pkg/docker/Dockerfile.node16 index 3b4a98e2..246105d8 100644 --- a/pkg/docker/Dockerfile.node16 +++ b/pkg/docker/Dockerfile.node16 @@ -8,7 +8,7 @@ RUN set -ex \ && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \ && hg clone https://hg.nginx.org/unit \ && cd unit \ - && hg up 1.26.1 \ + && hg up 1.27.0 \ && 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)" \ @@ -46,10 +46,14 @@ COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/ COPY --from=BUILDER /requirements.apt /requirements.apt -COPY --from=BUILDER /usr/lib/x86_64-linux-gnu/libunit.a /usr/lib/x86_64-linux-gnu/ +COPY --from=BUILDER /usr/lib/*-linux-gnu/libunit.a /tmp/ COPY --from=BUILDER /usr/include/nxt_* /usr/include/ COPY --from=BUILDER /usr/local/lib/node_modules/unit-http/ /usr/local/lib/node_modules/unit-http/ RUN set -x \ + && if [ -f "/tmp/libunit.a" ]; then \ + mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \ + rm -f /tmp/libunit.a; \ + fi \ && mkdir -p /var/lib/unit/ \ && mkdir /docker-entrypoint.d/ \ && addgroup --system unit \ |