diff --git a/.env b/.env index e1d4aa3..770d70c 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ MODE=PRODUCTION LOG_LEVEL=INFO PORT=9099 SPARK_HOST=hdcpx02.interno -MONGO=mongodb://localhost:27017 +MONGO=mongodb://notebook:burning-book@localhost:27017 USER_BLACKLIST=sods3001,phdpdig SPARK_QUEUE=root.digital.users SPARK_LIBRARIES=/data2/digital_stage/app/production/scala/Load_digital/lib/commons-csv-1.2.jar,/data2/digital_stage/app/production/scala/Load_digital/lib/spark-csv_2.10-1.5.0.jar diff --git a/docker-compose-hml.yml b/docker-compose-production.yml similarity index 72% rename from docker-compose-hml.yml rename to docker-compose-production.yml index baebed3..332ffff 100644 --- a/docker-compose-hml.yml +++ b/docker-compose-production.yml @@ -1,5 +1,15 @@ version: '3' services: + web: + build: . + ports: + - 9085:9085 + links: + - mongo + restart: always + environment: + MONGO: mongodb://notebook:burning-book@localhost:27017 + mongo: image: mongo restart: always diff --git a/docker-compose.yml b/docker-compose.yml index a8f9a98..6534b2b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,5 @@ version: '3' services: - web: - build: . - ports: - - 9085:9085 - links: - - mongo - restart: always - mongo: image: mongo restart: always @@ -24,8 +16,6 @@ services: - 9086:8081 links: - mongo - depends_on: - - mongo environment: ME_CONFIG_MONGODB_ADMINUSERNAME: notebook ME_CONFIG_MONGODB_ADMINPASSWORD: burning-book \ No newline at end of file diff --git a/package.json b/package.json index 2dc2c19..9b537a6 100644 --- a/package.json +++ b/package.json @@ -7,10 +7,10 @@ "url": "git@github.com:thiagocoutinhor/burning-books.git" }, "scripts": { - "docker": "docker-compose build && docker-compose up -d", - "prestart": "docker-compose -f docker-compose-hml.yml up -d", - "start": "node index.js", - "stop": "docker-compose -f docker-compose-hml.yml stop" + "production": "docker-compose -f docker-compose-production build && docker-compose -f docker-compose-production up -d", + "prestart": "docker-compose up -d", + "start": "nodemon", + "stop": "docker-compose stop" }, "nodemonConfig": { "ignore": [ diff --git a/web/burning-books.xcf b/web/burning-books.xcf new file mode 100644 index 0000000..96da245 Binary files /dev/null and b/web/burning-books.xcf differ diff --git a/web/favicon.ico b/web/favicon.ico new file mode 100644 index 0000000..b2d7100 Binary files /dev/null and b/web/favicon.ico differ diff --git a/web/router-web.js b/web/router-web.js index 17a7f6c..0ebb32d 100644 --- a/web/router-web.js +++ b/web/router-web.js @@ -16,6 +16,9 @@ scriptRouter.use('/popper.js', express.static('./node_modules/popper.js/dist/umd cssRouter.use('/', express.static('./web/css')) cssRouter.use('/bootstrap.css', express.static('./node_modules/bootstrap/dist/css/bootstrap.min.css')) +router.get('/favicon.ico', (req, res) => { + res.sendFile('./favicon.ico', { root: __dirname}) +}) router.use('/script', scriptRouter) router.use('/css', cssRouter)