From 795ed66e702447a02e696d18565ae3c3fc5fc498 Mon Sep 17 00:00:00 2001 From: Ahmad Rafiee Date: Sun, 21 Apr 2019 22:15:56 +0430 Subject: [PATCH 1/3] change docker-compose.yml and buid image --- docker-compose.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index cea7f43..ef1c7ec 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,4 +1,4 @@ - +--- version: '3' services: mongodb: @@ -21,5 +21,9 @@ services: volumes: - .:/app - /app/node_modules - env_file: .env + labels: + - "Project.Name=Paraffin" + - "Module.Name=apiserver" + - "version=0.01" + - "maintainer=rafiee1001@gmail.com" From a8542dba23480f1cff3fdc9284b6832c89821ad9 Mon Sep 17 00:00:00 2001 From: Ahmad Rafiee Date: Sun, 21 Apr 2019 22:25:44 +0430 Subject: [PATCH 2/3] change docker-compose.yml and buid image --- docker-compose.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index ef1c7ec..9375179 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,5 +1,5 @@ --- -version: '3' +version: '3.3' services: mongodb: image: mongo:3.6.6 @@ -9,6 +9,11 @@ services: parse-server: build: context: . + labels: + - "Project.Name=Paraffin" + - "Module.Name=apiserver" + - "version=0.01" + - "maintainer=rafiee1001@gmail.com" dockerfile: Dockerfile container_name: parser-server command: node index.js @@ -22,8 +27,3 @@ services: - .:/app - /app/node_modules env_file: .env - labels: - - "Project.Name=Paraffin" - - "Module.Name=apiserver" - - "version=0.01" - - "maintainer=rafiee1001@gmail.com" From 2ae7e2eb59a5d5535bd57a535236664800da50c8 Mon Sep 17 00:00:00 2001 From: Ahmad Rafiee Date: Sun, 21 Apr 2019 22:27:01 +0430 Subject: [PATCH 3/3] change docker-compose.yml and buid image --- env.sample | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/env.sample b/env.sample index baac80e..7e116e9 100644 --- a/env.sample +++ b/env.sample @@ -1,9 +1,9 @@ -PROCESS_TYPE='parse-server' -DB_URL='mongodb://localhost:27017/paraffin' +PROCESS_TYPE=parse-server +DB_URL=mongodb://mongodb:27017/paraffin JAVASCRIPT_KEY=JAVASCRIPT_KEY -CLOUD_CODE_MAIN='/cloud/main.js' +CLOUD_CODE_MAIN=/cloud/main.js COLLECTION_PREFIX=COLLECTION_PREFIX -PUBLIC_SERVER_URL='http://localhost:1337/api' +PUBLIC_SERVER_URL=http://localhost:1337/api MASTER_KEY=MASTER_KEY REST_KEY=REST_KEY CLIENT_KEY=CLIENT_KEY @@ -11,7 +11,7 @@ JAVASCRIPT_KEY=JAVASCRIPT_KEY DOTNET_KEY=DOTNET_KEY LOG_LEVEL=info APP_NAME=Paraffin Platform -API_SERVER_URL='http://localhost:1337/api' +API_SERVER_URL=http://localhost:1337/api PARSE_MOUNT=api APP_ID=APP_ID REST_API_KEY=REST_API_KEY @@ -19,4 +19,4 @@ FILE_KEY=FILE_KEY DASHBOARD_USER=admin DASHOBOARD_PASS=admin PORT=1337 -ALLOW_INSECURE_HTTP=true \ No newline at end of file +ALLOW_INSECURE_HTTP=true