Commit 86430664 authored by Indrek Jentson's avatar Indrek Jentson

Parandused konfiguratsioonis

parent 0c040992
......@@ -31,7 +31,7 @@ RUN npm install -g forever
RUN git clone 'https://gitlab.keeleressursid.ee/keeleliin/keeleliin-wrapper.git' --single-branch wrapper && \
mkdir -p /config && mkdir -p /wrapper/files && mkdir -p /wrapper/tmp && mkdir -p /wrapper/logs && \
npm install && \
cd wrapper && npm install && \
echo "NPM is installed"
# Määratleme aktiivse töökataloogi
......@@ -43,8 +43,8 @@ WORKDIR /wrapper
# Kuna kasutame linuxi käsurea utiliiti, siis midagi spetsiaalset pole vaja lisada
COPY config_dist.js ./config.js
COPY command.sh .
COPY config_dist.js /wrapper/config.js
COPY command.sh /wrapper
# Tarkvara X paigaldamine lõppeb
......@@ -56,4 +56,4 @@ VOLUME ["/wrapper/logs"]
VOLUME ["/wrapper/files"]
VOLUME ["/wrapper/tmp"]
CMD ./docker_start.sh
CMD /wrapper/docker_start.sh
......@@ -3,14 +3,14 @@ var config = require('./global_config/global');
/*
* Teenuse url ilma pordita. Kasutatakse teenuse serverisse installeerimisel teenuse urli moodustamiseks: <url>:<port>/api/v1/
*/
config.serverUrl = 'http://dp.keeleressursid.ee';
config.serverUrl = 'http://wordcount';
/*
* Redis serveri andmed. Kui kasutatakse vaikeseadeid, siis pole vaja muuta
*/
config.redis = {
host: process.env.REDIS_PORT_6379_TCP_ADDR || "127.0.0.1",
port: process.env.REDIS_PORT_6379_TCP_PORT || 6379
host: 'redis',
port: 6379
};
/*
......@@ -18,7 +18,7 @@ config.redis = {
*/
config.integration = [
{
installUrl: 'http://dp.keeleressursid.ee:3000/api/v1/service/install',
installUrl: 'http://server:3000/api/v1/service/install',
apiKey: 'server-wrapper-api-key'
}
];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment