Commit Graph

225 Commits

Author SHA1 Message Date
Konstantin Pavlov
24243ecab3 Packages: Added Amazon Linux 2023. 2023-03-22 16:55:36 -07:00
Konstantin Pavlov
700ee28bbf Packages: check rpm database for actual provides.
Previously, we required an exact non-virtual package, however it's fine
if some package has a fully-virtual provides for what we need.
2023-03-22 16:55:25 -07:00
Alejandro Colomar
6e16d7ac5b Auto: mirroring installation structure in build tree.
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>
2023-03-29 00:41:08 +02:00
Alejandro Colomar
5ba79b9b52 Renamed --libstatedir to --statedir.
In BSD systems, it's usually </var/db> or some other dir under </var>
that is not </var/lib>, so $statedir is a more generic name.  See
hier(7).

Reported-by: Andrei Zeliankou <zelenkov@nginx.com>
Reported-by: Zhidao Hong <z.hong@f5.com>
Reviewed-by: Konstantin Pavlov <thresh@nginx.com>
Reviewed-by: Andrew Clayton <a.clayton@nginx.com>
Cc: Liam Crilly <liam@nginx.com>
Signed-off-by: Alejandro Colomar <alx@nginx.com>
2023-03-29 00:40:40 +02:00
Konstantin Pavlov
565dcbb139 Docker: bumped language versions. 2023-02-13 17:04:24 -08:00
Konstantin Pavlov
2a597c5c7a Docker: limited the waiting time for control socket creation.
While at it, fixed a typo.
2023-02-13 17:04:24 -08:00
Konstantin Pavlov
054518bb36 Docker: made dockerfiles use a single stage build process. 2023-02-13 17:04:24 -08:00
Konstantin Pavlov
eb47174875 Docker: added a target to generate Docker library definition. 2023-02-13 17:04:24 -08:00
Konstantin Pavlov
a8f21079e0 Docker: cleanup unused targets. 2023-02-13 17:04:24 -08:00
Konstantin Pavlov
1d515879f1 contrib: fixed njs make rule. 2023-02-28 10:42:18 -08:00
Andrei Zeliankou
814815a3c5 Merged with the 1.29 branch. 2023-03-01 18:25:52 +00:00
Andrei Zeliankou
0af1253c17 Generated Dockerfiles for Unit 1.29.1. 2023-02-28 14:52:32 +00:00
Konstantin Pavlov
132f7d18a2 contrib: updated njs to 0.7.10. 2023-02-27 15:45:04 -08:00
Konstantin Pavlov
f4298180eb contrib: updated njs to 0.7.10. 2023-02-27 15:45:04 -08:00
Konstantin Pavlov
b0bb829107 Packages: get rid of deprecated configure options. 2023-02-06 12:39:06 -08:00
Konstantin Pavlov
ab3d1297af Packages: do not clean up rpm build root.
These directories are used in the Makefile to determine status of a target.
2022-12-28 20:06:43 -08:00
Andrei Zeliankou
87a1a9c0d2 Generated Dockerfiles for Unit 1.29.0. 2022-12-15 12:42:01 +00:00
Konstantin Pavlov
cf3ffb8cf3 Packages: Used a more common name for pkg-config.
pkg-config package is named differently on supported rpm-based systems:
- Amazon Linux 2 has pkgconfig
- Fedora has pkgconf-pkg-config
- RHEL 7 has pkgconfig
- RHEL 8 and 9 have pkgconfig-pkg-config

What they share in common is they all provide 'pkgconfig', which we can
use in the spec file so we don't have to specify it per-OS.
2022-12-14 11:52:58 -08:00
Konstantin Pavlov
24e3f17102 Packages: added njs support. 2022-12-07 18:20:44 -08:00
Konstantin Pavlov
11c66941ce Added contribs and njs. 2022-11-29 18:12:54 +04:00
Konstantin Pavlov
63cc4a31bd Docker: limited the waiting time for control socket removal.
Fixes https://github.com/nginx/unit/issues/728
Refs https://github.com/nginx/unit/issues/718
2022-12-13 13:36:39 -08:00
Konstantin Pavlov
f09d0e2284 Regenerated Dockerfiles. 2022-12-13 11:50:42 -08:00
Konstantin Pavlov
9f6d7c7ccd Docker: bumped language versions. 2022-12-07 18:31:48 -08:00
Konstantin Pavlov
6afc524116 Packages: added Ubuntu 22.10 "kinetic" support. 2022-11-16 17:05:57 +04:00
Konstantin Pavlov
0feab91c5b Packages: added Fedora 37 support. 2022-11-16 17:06:42 +04:00
Konstantin Pavlov
2596a89527 Packages: do not clean up rpm build root.
These directories are used in the Makefile to determine status of a target.
2022-12-28 20:06:43 -08:00
Konstantin Pavlov
2ac4a7527d Packages: relaxed dependencies between modules and base package.
This allows us to update base or single modules packages without
updating the whole set.
2022-11-04 16:52:19 +04:00
Konstantin Pavlov
11f416878a Packages: added Python 3.8 and Python 3.9 modules on RHEL 8 clones.
Refs: https://github.com/nginx/unit/issues/778
2022-11-04 13:55:16 +04:00
Alejandro Colomar
a3cb07df20 Fixed path for sed(1).
Some distros provide it in /bin/sed and others in both /bin/sed
and /usr/bin/sed.  Use the more available one.

Reported-by: Konstantin Pavlov <thresh@nginx.com>
Fixes: ac64ffde57 "Improved readability of <docker-entrypoint.sh>."
Signed-off-by: Alejandro Colomar <alx@nginx.com>
2022-10-27 14:30:49 +02:00
javad mnjd
ac64ffde57 Improved readability of <docker-entrypoint.sh>.
Cc: Konstantin Pavlov <thresh@nginx.com>
Signed-off-by: Alejandro Colomar <alx@nginx.com>
2022-10-26 16:32:15 +02:00
Andrei Zeliankou
38bd7e76a1 Generated Dockerfiles for Unit 1.28.0. 2022-09-13 07:26:26 +08:00
Konstantin Pavlov
4924bd185d Regenerated Dockerfiles. 2022-09-09 17:45:58 +04:00
Konstantin Pavlov
38350c17fc Docker: bumped language versions, moved jsc11 to eclipse-temurin.
openjdk builds are no longer provided in the docker library due to deprecation.
2022-09-09 16:17:42 +04:00
Konstantin Pavlov
97124fc349 Packaging: removed support for SLES and derivatives.
The packages were never built for those OSes.
2022-06-21 15:04:19 +04:00
Konstantin Pavlov
637a2006a6 Packages: cleanup targets that are not supported anymore. 2022-06-20 18:20:11 +04:00
Konstantin Pavlov
d220eb2996 Packages: dropped /etc/unit directory.
It's never used.
2022-06-20 10:53:24 +04:00
Andrei Zeliankou
3d1fa29f1d Generated Dockerfiles for Unit 1.27.0. 2022-06-02 12:31:55 +00:00
Konstantin Pavlov
3d53bba5b3 Packaging: added support for RHEL 9. 2022-05-31 18:35:39 +04:00
Konstantin Pavlov
237ddbe177 Packaging: Go: use GO111MODULE=auto in build instructions. 2022-05-26 10:52:58 +04:00
Konstantin Pavlov
3e06ae3b34 Packages: ship README.md and CONTRIBUTING.md. 2022-05-16 17:22:40 +04:00
Konstantin Pavlov
b512eff4ac Packages: added Ubuntu 22.04 "jammy" support. 2022-05-05 13:25:52 +04:00
Konstantin Pavlov
1fe389c2e2 Regenerated Dockerfiles. 2022-05-11 13:06:17 +04:00
Konstantin Pavlov
967fa8f78a Docker: bumped language versions. 2022-05-11 12:59:39 +04:00
Valentin Bartenev
5857754ec7 Updated copyright notice. 2022-02-15 18:21:10 +03:00
Konstantin Pavlov
485886d8f9 Docker: bumped Python image version. 2022-01-13 11:35:12 +03:00
Konstantin Pavlov
6507849282 Docker: bumped PHP image version. 2021-12-17 17:15:55 +03:00
Konstantin Pavlov
3e0ece20b5 Docker: made Dockerfiles architecture agnostic. 2021-12-01 18:34:20 +03:00
Valentin Bartenev
8b954d8331 Generated Dockerfiles for Unit 1.26.1. 2021-12-02 18:23:00 +03:00
Andrei Belov
8aa40e5901 Packages: added systemd service for debug binary. 2021-12-02 08:52:52 +03:00
Konstantin Pavlov
380f2dc2ba Docker: respect the binary from CMD in the entrypoint. 2021-11-30 17:00:47 +03:00