summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorKonstantin Pavlov <thresh@nginx.com>2020-09-22 15:55:28 +0300
committerKonstantin Pavlov <thresh@nginx.com>2020-09-22 15:55:28 +0300
commite0f66cbba095d4a4739b414a8878b567dc930b01 (patch)
treeccc4511a66004971d5a684e67b3c6686e38c16ac
parent2821b3347c026ae171228146c5ccd0bd7408358f (diff)
downloadunit-e0f66cbba095d4a4739b414a8878b567dc930b01.tar.gz
unit-e0f66cbba095d4a4739b414a8878b567dc930b01.tar.bz2
Added jsc11 docker image.
-rw-r--r--pkg/docker/Dockerfile.tmpl2
-rw-r--r--pkg/docker/Makefile6
2 files changed, 6 insertions, 2 deletions
diff --git a/pkg/docker/Dockerfile.tmpl b/pkg/docker/Dockerfile.tmpl
index 3372ef6f..8b0e35e4 100644
--- a/pkg/docker/Dockerfile.tmpl
+++ b/pkg/docker/Dockerfile.tmpl
@@ -21,6 +21,8 @@ RUN set -x \
done; \
test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
+# work-around debian bug 863199
+ && mkdir -p /usr/share/man/man1 \
&& dpkgArch="$(dpkg --print-architecture)" \
&& unitPackages=@@UNITPACKAGES@@ \
&& case "$dpkgArch" in \
diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile
index 7647e51b..d18e2b18 100644
--- a/pkg/docker/Makefile
+++ b/pkg/docker/Makefile
@@ -12,7 +12,7 @@ CODENAME := buster
UNIT_VERSION = $(VERSION)-$(RELEASE)~$(CODENAME)
MODULES = python2.7 python3.7 php7.3 go1.11-dev perl5.28 ruby2.5 \
- full minimal
+ jsc11 full minimal
MODULE_php7.3="unit=$${UNIT_VERSION} unit-php=$${UNIT_VERSION}"
@@ -26,7 +26,9 @@ MODULE_perl5.28="unit=$${UNIT_VERSION} unit-perl=$${UNIT_VERSION}"
MODULE_ruby2.5="unit=$${UNIT_VERSION} unit-ruby=$${UNIT_VERSION}"
-MODULE_full="unit=$${UNIT_VERSION} unit-php=$${UNIT_VERSION} unit-python2.7=$${UNIT_VERSION} unit-python3.7=$${UNIT_VERSION} unit-perl=$${UNIT_VERSION} unit-ruby=$${UNIT_VERSION}"
+MODULE_jsc11="unit=$${UNIT_VERSION} unit-jsc11=$${UNIT_VERSION}"
+
+MODULE_full="unit=$${UNIT_VERSION} unit-php=$${UNIT_VERSION} unit-python2.7=$${UNIT_VERSION} unit-python3.7=$${UNIT_VERSION} unit-perl=$${UNIT_VERSION} unit-ruby=$${UNIT_VERSION} unit-jsc11=$${UNIT_VERSION}"
MODULE_minimal="unit=$${UNIT_VERSION}"