From 22c917bead38df560bb112006d0b4a28aa8919d3 Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Tue, 16 Jun 2020 15:02:29 +0300 Subject: Packages: added Fedora 32 support. --- pkg/rpm/Makefile | 6 ++- pkg/rpm/Makefile.python38 | 57 ++++++++++++++++++++++ .../rpmbuild/SOURCES/unit.example-python38-config | 17 +++++++ 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 pkg/rpm/Makefile.python38 create mode 100644 pkg/rpm/rpmbuild/SOURCES/unit.example-python38-config (limited to 'pkg') diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index 8bc96d99..70100896 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -124,8 +124,12 @@ endif ifeq ($(OSVER), fedora) include Makefile.php +ifeq ($(shell test `rpm --eval '0%{?fedora} -lt 32'`; echo $$?),0) include Makefile.python27 -ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 29'`; echo $$?),0) +endif +ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 32'`; echo $$?),0) +include Makefile.python38 +else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 29'`; echo $$?),0) include Makefile.python37 else include Makefile.python36 diff --git a/pkg/rpm/Makefile.python38 b/pkg/rpm/Makefile.python38 new file mode 100644 index 00000000..ffcca07f --- /dev/null +++ b/pkg/rpm/Makefile.python38 @@ -0,0 +1,57 @@ +MODULES+= python38 +MODULE_SUFFIX_python38= python3.8 + +MODULE_SUMMARY_python38= Python 3.8 module for NGINX Unit + +MODULE_VERSION_python38= $(VERSION) +MODULE_RELEASE_python38= 1 + +MODULE_CONFARGS_python38= python --config=python3.8-config +MODULE_MAKEARGS_python38= python3.8 +MODULE_INSTARGS_python38= python3.8-install + +MODULE_SOURCES_python38= unit.example-python-app \ + unit.example-python38-config + +ifneq (,$(findstring $(OSVER),opensuse-tumbleweed sles fedora amazonlinux2)) +BUILD_DEPENDS_python38= python3-devel +else +BUILD_DEPENDS_python38= python38-devel +endif + +BUILD_DEPENDS+= $(BUILD_DEPENDS_python38) + +define MODULE_PREINSTALL_python38 +%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python38/examples/python-app +%{__install} -m 644 -p %{SOURCE100} \ + %{buildroot}%{_datadir}/doc/unit-python38/examples/python-app/wsgi.py +%{__install} -m 644 -p %{SOURCE101} \ + %{buildroot}%{_datadir}/doc/unit-python38/examples/unit.config +endef +export MODULE_PREINSTALL_python38 + +define MODULE_FILES_python38 +%{_libdir}/unit/modules/* +%{_libdir}/unit/debug-modules/* +endef +export MODULE_FILES_python38 + +define MODULE_POST_python38 +cat < Date: Mon, 13 Jul 2020 15:06:26 +0300 Subject: Docker: run entrypoint scripts for unitd-debug as well. --- pkg/docker/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg') diff --git a/pkg/docker/docker-entrypoint.sh b/pkg/docker/docker-entrypoint.sh index 4ad7cb9a..f455a958 100755 --- a/pkg/docker/docker-entrypoint.sh +++ b/pkg/docker/docker-entrypoint.sh @@ -18,7 +18,7 @@ curl_put() return 0 } -if [ "$1" = "unitd" ]; then +if [ "$1" = "unitd" -o "$1" = "unitd-debug" ]; then if /usr/bin/find "/var/lib/unit/" -mindepth 1 -print -quit 2>/dev/null | /bin/grep -q .; then echo "$0: /var/lib/unit/ is not empty, skipping initial configuration..." else -- cgit From ba445d31f17194be335fb8bf6295bceac991299d Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Thu, 13 Aug 2020 19:22:41 +0300 Subject: Generated Dockerfiles for Unit 1.19.0. --- pkg/docker/Dockerfile.full | 2 +- pkg/docker/Dockerfile.go1.11-dev | 2 +- pkg/docker/Dockerfile.minimal | 2 +- pkg/docker/Dockerfile.perl5.28 | 2 +- pkg/docker/Dockerfile.php7.3 | 2 +- pkg/docker/Dockerfile.python2.7 | 2 +- pkg/docker/Dockerfile.python3.7 | 2 +- pkg/docker/Dockerfile.ruby2.5 | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'pkg') diff --git a/pkg/docker/Dockerfile.full b/pkg/docker/Dockerfile.full index 08593732..fc100635 100644 --- a/pkg/docker/Dockerfile.full +++ b/pkg/docker/Dockerfile.full @@ -2,7 +2,7 @@ FROM debian:buster-slim LABEL maintainer="NGINX Docker Maintainers " -ENV UNIT_VERSION 1.18.0-1~buster +ENV UNIT_VERSION 1.19.0-1~buster RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.go1.11-dev b/pkg/docker/Dockerfile.go1.11-dev index ee51f83e..7c3f234e 100644 --- a/pkg/docker/Dockerfile.go1.11-dev +++ b/pkg/docker/Dockerfile.go1.11-dev @@ -2,7 +2,7 @@ FROM debian:buster-slim LABEL maintainer="NGINX Docker Maintainers " -ENV UNIT_VERSION 1.18.0-1~buster +ENV UNIT_VERSION 1.19.0-1~buster RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.minimal b/pkg/docker/Dockerfile.minimal index 08be78bc..48f1864c 100644 --- a/pkg/docker/Dockerfile.minimal +++ b/pkg/docker/Dockerfile.minimal @@ -2,7 +2,7 @@ FROM debian:buster-slim LABEL maintainer="NGINX Docker Maintainers " -ENV UNIT_VERSION 1.18.0-1~buster +ENV UNIT_VERSION 1.19.0-1~buster RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.perl5.28 b/pkg/docker/Dockerfile.perl5.28 index a8f84c17..bff0ba0c 100644 --- a/pkg/docker/Dockerfile.perl5.28 +++ b/pkg/docker/Dockerfile.perl5.28 @@ -2,7 +2,7 @@ FROM debian:buster-slim LABEL maintainer="NGINX Docker Maintainers " -ENV UNIT_VERSION 1.18.0-1~buster +ENV UNIT_VERSION 1.19.0-1~buster RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.php7.3 b/pkg/docker/Dockerfile.php7.3 index fe60cf44..832baa5d 100644 --- a/pkg/docker/Dockerfile.php7.3 +++ b/pkg/docker/Dockerfile.php7.3 @@ -2,7 +2,7 @@ FROM debian:buster-slim LABEL maintainer="NGINX Docker Maintainers " -ENV UNIT_VERSION 1.18.0-1~buster +ENV UNIT_VERSION 1.19.0-1~buster RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.python2.7 b/pkg/docker/Dockerfile.python2.7 index f80ca098..85f0add6 100644 --- a/pkg/docker/Dockerfile.python2.7 +++ b/pkg/docker/Dockerfile.python2.7 @@ -2,7 +2,7 @@ FROM debian:buster-slim LABEL maintainer="NGINX Docker Maintainers " -ENV UNIT_VERSION 1.18.0-1~buster +ENV UNIT_VERSION 1.19.0-1~buster RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.python3.7 b/pkg/docker/Dockerfile.python3.7 index 8d5b4d9b..cefd15c1 100644 --- a/pkg/docker/Dockerfile.python3.7 +++ b/pkg/docker/Dockerfile.python3.7 @@ -2,7 +2,7 @@ FROM debian:buster-slim LABEL maintainer="NGINX Docker Maintainers " -ENV UNIT_VERSION 1.18.0-1~buster +ENV UNIT_VERSION 1.19.0-1~buster RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.ruby2.5 b/pkg/docker/Dockerfile.ruby2.5 index 365d71ac..36f9594f 100644 --- a/pkg/docker/Dockerfile.ruby2.5 +++ b/pkg/docker/Dockerfile.ruby2.5 @@ -2,7 +2,7 @@ FROM debian:buster-slim LABEL maintainer="NGINX Docker Maintainers " -ENV UNIT_VERSION 1.18.0-1~buster +ENV UNIT_VERSION 1.19.0-1~buster RUN set -x \ && apt-get update \ -- cgit