6e16d7ac5b
This makes the build tree more organized, which is good for adding new
stuff. Now, it's useful for example for adding manual pages in man3/,
but it may be useful in the future for example for extending the build
system to run linters (e.g., clang-tidy(1), Clang analyzer, ...) on the
C source code.
Previously, the build tree was quite flat, and looked like this (after
`./configure && make`):
$ tree -I src build
build
├── Makefile
├── autoconf.data
├── autoconf.err
├── echo
├── libnxt.a
├── nxt_auto_config.h
├── nxt_version.h
├── unitd
└── unitd.8
1 directory, 9 files
And after this patch, it looks like this:
$ tree -I src build
build
├── Makefile
├── autoconf.data
├── autoconf.err
├── bin
│ └── echo
├── include
│ ├── nxt_auto_config.h
│ └── nxt_version.h
├── lib
│ ├── libnxt.a
│ └── unit
│ └── modules
├── sbin
│ └── unitd
├── share
│ └── man
│ └── man8
│ └── unitd.8
└── var
├── lib
│ └── unit
├── log
│ └── unit
└── run
└── unit
17 directories, 9 files
It also solves one issue introduced in
5a37171f73 ("Added default values for pathnames."). Before that
commit, it was possible to run unitd from the build system
(`./build/unitd`). Now, since it expects files in a very specific
location, that has been broken. By having a directory structure that
mirrors the installation, it's possible to trick it to believe it's
installed, and run it from there:
$ ./configure --prefix=./build
$ make
$ ./build/sbin/unitd
Fixes: 5a37171f73 ("Added default values for pathnames.")
Reported-by: Liam Crilly <liam@nginx.com>
Reviewed-by: Konstantin Pavlov <thresh@nginx.com>
Reviewed-by: Andrew Clayton <a.clayton@nginx.com>
Cc: Andrei Zeliankou <zelenkov@nginx.com>
Cc: Zhidao Hong <z.hong@f5.com>
Signed-off-by: Alejandro Colomar <alx@nginx.com>
74 lines
3.2 KiB
Docker
74 lines
3.2 KiB
Docker
FROM @@CONTAINER@@ as BUILDER
|
|
|
|
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
|
|
|
|
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 \
|
|
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
|
|
&& hg clone https://hg.nginx.org/unit \
|
|
&& cd unit \
|
|
&& hg up @@VERSION@@ \
|
|
&& 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="--prefix=/usr \
|
|
--statedir=/var/lib/unit \
|
|
--control=unix:/var/run/control.unit.sock \
|
|
--pid=/var/run/unit.pid \
|
|
--log=/var/log/unit.log \
|
|
--tmpdir=/var/tmp \
|
|
--user=unit \
|
|
--group=unit \
|
|
--openssl \
|
|
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
|
|
&& ./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 \
|
|
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
|
|
&& ./configure @@CONFIGURE@@ \
|
|
&& make -j $NCPU @@INSTALL@@ \
|
|
&& make clean \
|
|
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
|
|
&& ./configure @@CONFIGURE@@ \
|
|
&& make -j $NCPU @@INSTALL@@ \
|
|
&& 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; } \
|
|
&& @@RUN@@ \
|
|
&& mkdir -p /var/lib/unit/ \
|
|
&& mkdir /docker-entrypoint.d/ \
|
|
&& addgroup --system unit \
|
|
&& adduser \
|
|
--system \
|
|
--disabled-login \
|
|
--ingroup unit \
|
|
--no-create-home \
|
|
--home /nonexistent \
|
|
--gecos "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 \
|
|
&& apt-get clean && 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/
|
|
|
|
STOPSIGNAL SIGTERM
|
|
|
|
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
|
|
|
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
|