technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Regenerated Dockerfiles.

Browse Source
This commit is contained in:
Konstantin Pavlov
2022-05-11 13:06:17 +04:00
parent 967fa8f78a
commit 1fe389c2e2
8 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/docker/Dockerfile.go1.17 → pkg/docker/Dockerfile.go1.18
View File

@@ -1,4 +1,4 @@
FROM golang:1.17 as BUILDER FROM golang:1.18 as BUILDER
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
@@ -40,16 +40,20 @@ RUN set -ex \
&& make -j $NCPU go-install-src libunit-install \ && make -j $NCPU go-install-src libunit-install \
&& ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt && ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
FROM golang:1.17 FROM golang:1.18
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/ COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
COPY --from=BUILDER /requirements.apt /requirements.apt 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/include/nxt_* /usr/include/
COPY --from=BUILDER /go/src/ /go/src/ COPY --from=BUILDER /go/src/ /go/src/
RUN set -x \ 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 -p /var/lib/unit/ \
&& mkdir /docker-entrypoint.d/ \ && mkdir /docker-entrypoint.d/ \
&& addgroup --system unit \ && addgroup --system unit \

4
pkg/docker/Dockerfile.jsc11
View File

@@ -48,6 +48,10 @@ COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
COPY --from=BUILDER /requirements.apt /requirements.apt COPY --from=BUILDER /requirements.apt /requirements.apt
COPY --from=BUILDER /usr/share/unit-jsc-common/ /usr/share/unit-jsc-common/ COPY --from=BUILDER /usr/share/unit-jsc-common/ /usr/share/unit-jsc-common/
RUN set -x \ 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 -p /var/lib/unit/ \
&& mkdir /docker-entrypoint.d/ \ && mkdir /docker-entrypoint.d/ \
&& addgroup --system unit \ && addgroup --system unit \

4
pkg/docker/Dockerfile.minimal
View File

@@ -48,6 +48,10 @@ COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
COPY --from=BUILDER /requirements.apt /requirements.apt COPY --from=BUILDER /requirements.apt /requirements.apt
RUN set -x \ 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 -p /var/lib/unit/ \
&& mkdir /docker-entrypoint.d/ \ && mkdir /docker-entrypoint.d/ \
&& addgroup --system unit \ && addgroup --system unit \

6
pkg/docker/Dockerfile.node16
View File

@@ -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/sbin/unitd-debug /usr/sbin/unitd-debug
COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/ COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
COPY --from=BUILDER /requirements.apt /requirements.apt 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/include/nxt_* /usr/include/
COPY --from=BUILDER /usr/local/lib/node_modules/unit-http/ /usr/local/lib/node_modules/unit-http/ COPY --from=BUILDER /usr/local/lib/node_modules/unit-http/ /usr/local/lib/node_modules/unit-http/
RUN set -x \ 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 -p /var/lib/unit/ \
&& mkdir /docker-entrypoint.d/ \ && mkdir /docker-entrypoint.d/ \
&& addgroup --system unit \ && addgroup --system unit \

4
pkg/docker/Dockerfile.perl5.34
View File

@@ -48,6 +48,10 @@ COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
COPY --from=BUILDER /requirements.apt /requirements.apt COPY --from=BUILDER /requirements.apt /requirements.apt
RUN set -x \ 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 -p /var/lib/unit/ \
&& mkdir /docker-entrypoint.d/ \ && mkdir /docker-entrypoint.d/ \
&& addgroup --system unit \ && addgroup --system unit \

8
pkg/docker/Dockerfile.php8.0 → pkg/docker/Dockerfile.php8.1
View File

@@ -1,4 +1,4 @@
FROM php:8.0-cli as BUILDER FROM php:8.1-cli as BUILDER
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
@@ -40,7 +40,7 @@ RUN set -ex \
&& make -j $NCPU php-install \ && make -j $NCPU php-install \
&& ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt && ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
FROM php:8.0-cli FROM php:8.1-cli
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
@@ -48,6 +48,10 @@ COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
COPY --from=BUILDER /requirements.apt /requirements.apt COPY --from=BUILDER /requirements.apt /requirements.apt
RUN ldconfig RUN ldconfig
RUN set -x \ 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 -p /var/lib/unit/ \
&& mkdir /docker-entrypoint.d/ \ && mkdir /docker-entrypoint.d/ \
&& addgroup --system unit \ && addgroup --system unit \

8
pkg/docker/Dockerfile.python3.9 → pkg/docker/Dockerfile.python3.10
View File

@@ -1,4 +1,4 @@
FROM python:3.9 as BUILDER FROM python:3.10 as BUILDER
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
@@ -40,7 +40,7 @@ RUN set -ex \
&& make -j $NCPU python3-install \ && make -j $NCPU python3-install \
&& ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt && ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
FROM python:3.9 FROM python:3.10
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
@@ -48,6 +48,10 @@ COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
COPY --from=BUILDER /requirements.apt /requirements.apt COPY --from=BUILDER /requirements.apt /requirements.apt
RUN set -x \ 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 -p /var/lib/unit/ \
&& mkdir /docker-entrypoint.d/ \ && mkdir /docker-entrypoint.d/ \
&& addgroup --system unit \ && addgroup --system unit \

8
pkg/docker/Dockerfile.ruby3.0 → pkg/docker/Dockerfile.ruby3.1
View File

@@ -1,4 +1,4 @@
FROM ruby:3.0 as BUILDER FROM ruby:3.1 as BUILDER
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
@@ -40,7 +40,7 @@ RUN set -ex \
&& make -j $NCPU ruby-install \ && make -j $NCPU ruby-install \
&& ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt && ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
FROM ruby:3.0 FROM ruby:3.1
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
@@ -48,6 +48,10 @@ COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
COPY --from=BUILDER /requirements.apt /requirements.apt COPY --from=BUILDER /requirements.apt /requirements.apt
RUN gem install rack RUN gem install rack
RUN set -x \ 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 -p /var/lib/unit/ \
&& mkdir /docker-entrypoint.d/ \ && mkdir /docker-entrypoint.d/ \
&& addgroup --system unit \ && addgroup --system unit \