From 33d04dc4f43508d486079791f0fdd4e9322756f4 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Fri, 21 Feb 2020 14:58:20 +0300 Subject: [PATCH] Remove nodejs dependency --- Dockerfile | 6 ++---- run-document-server.sh | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 037e736..c737318 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,15 +7,14 @@ ARG ONLYOFFICE_VALUE=onlyoffice RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ apt-get -y update && \ - apt-get -yq install wget apt-transport-https gnupg curl locales && \ + apt-get -yq install wget apt-transport-https gnupg locales && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0x8320ca65cb2de8e5 && \ locale-gen en_US.UTF-8 && \ - curl -sL https://deb.nodesource.com/setup_10.x | bash - && \ - apt-get -y update && \ apt-get -yq install \ adduser \ apt-utils \ bomstrip \ + curl \ htop \ libasound2 \ libboost-regex-dev \ @@ -35,7 +34,6 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ net-tools \ netcat \ nginx-extras \ - nodejs \ postgresql \ postgresql-client \ pwgen \ diff --git a/run-document-server.sh b/run-document-server.sh index 0923cf2..7a1a7fc 100755 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -45,7 +45,7 @@ ONLYOFFICE_DEFAULT_CONFIG=${CONF_DIR}/local.json ONLYOFFICE_LOG4JS_CONFIG=${CONF_DIR}/log4js/production.json ONLYOFFICE_EXAMPLE_CONFIG=${CONF_DIR}-example/local.json -JSON_BIN=${APP_DIR}/npm/node_modules/.bin/json +JSON_BIN=${APP_DIR}/npm/json JSON="${JSON_BIN} -q -f ${ONLYOFFICE_DEFAULT_CONFIG}" JSON_LOG="${JSON_BIN} -q -f ${ONLYOFFICE_LOG4JS_CONFIG}" JSON_EXAMPLE="${JSON_BIN} -q -f ${ONLYOFFICE_EXAMPLE_CONFIG}"