Commit b34fb64d authored by Lucas Fernandes de Oliveira's avatar Lucas Fernandes de Oliveira

Merge branch 'issue/158' into 'develop'

Issue/158

See merge request simmc/simmc!850
parents 87229aad 200c041d
Pipeline #14869 passed with stage
in 8 seconds
......@@ -7,20 +7,16 @@ services:
depends_on:
- blendb
- simmc-webservice
# - db
- db
volumes:
-
type: tmpfs
target: /tmp
-
type: tmpfs
target: /home/node/app/build
-
type: tmpfs
target: /home/node/app/reports/build
-
type: tmpfs
target: /home/node/app/tmp
- type: tmpfs
target: /tmp
- type: tmpfs
target: /home/node/app/build
- type: tmpfs
target: /home/node/app/reports/build
- type: tmpfs
target: /home/node/app/tmp
environment:
NODE_ENV: ${NODE_ENV}
SIMMC_DB_USER: ${SIMMC_DB_USER}
......@@ -50,11 +46,12 @@ services:
read_only: 'true'
security_opt:
- no-new-privileges
blendb:
image: marula.c3sl.ufpr.br:5000/c3sl/blendb:latest
container_name: blendb
# depends_on:
# - db
depends_on:
- db
environment:
BLENDB_DB_USER: ${SIMMC_DB_USER}
BLENDB_DB_PASSWORD: ${SIMMC_DB_PASSWORD}
......@@ -65,13 +62,11 @@ services:
BLENDB_ST_INSERT: 'false'
BLENDB_ADAPTER: 'postgres'
volumes:
-
type: bind
source: ./blendb.yaml
target: /home/node/app/config/config.yaml
-
type: tmpfs
target: /tmp
- type: bind
source: ./blendb.yaml
target: /home/node/app/config/config.yaml
- type: tmpfs
target: /tmp
ports:
- "3000"
restart: unless-stopped
......@@ -83,9 +78,8 @@ services:
image: marula.c3sl.ufpr.br:5000/c3sl/simmc-webservice:latest
container_name: simmc-webservice
volumes:
-
type: tmpfs
target: /tmp
- type: tmpfs
target: /tmp
environment:
NODE_ENV: ${NODE_ENV}
SIMMCWEBSERVICE_AGENT_LINUX_VERSION: ${SIMMCWEBSERVICE_AGENT_LINUX_VERSION}
......@@ -102,18 +96,24 @@ services:
read_only: 'true'
security_opt:
- no-new-privileges
memcached:
image: memcached:1.5.4
container_name: memcached
ports:
- "11211"
# db:
# image: postgres:9.6
# container_name: db
# ports:
# - "5432:5432"
# restart: unless-stopped
# #read_only: 'true'
# security_opt:
# - no-new-privileges
db:
build:
context: ./postgres
container_name: db
ports:
- "5432:5432"
restart: unless-stopped
security_opt:
- no-new-privileges
volumes:
- ./postgres/pg_data:/var/lib/postgresql/data
environment:
POSTGRES_USER: ${SIMMC_DB_USER}
POSTGRES_PASSWORD: ${SIMMC_DB_PASSWORD}
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