Browse Source

update

master
Yutsuo 6 years ago
parent
commit
379ae80a5b
  1. 2
      Dockerfile
  2. 34
      docker-compose.proxy.yml
  3. 6
      src/server.js

2
Dockerfile

@ -1,4 +1,4 @@
FROM node:current-alpine AS builder
FROM node:alpine
WORKDIR /usr/src/app
COPY /package.json /app/
COPY ["package.json", "package-lock.json*", "npm-shrinkwrap.json*", "./"]

34
docker-compose-proxy.yml → docker-compose.proxy.yml

@ -6,9 +6,9 @@ services:
volumes:
- ./mongo_data:/data/db
environment:
- MONGO_INITDB_DATABASE=forms
- MONGO_INITDB_ROOT_USERNAME=mongodbUser
- MONGO_INITDB_ROOT_PASSWORD=mongodbPass
- MONGO_INITDB_DATABASE=todos
- MONGO_INITDB_ROOT_USERNAME=admin
- MONGO_INITDB_ROOT_PASSWORD=admin
ports:
- "27017:27017"
@ -20,10 +20,10 @@ services:
environment:
- ME_CONFIG_MONGODB_SERVER=mongodb
- ME_CONFIG_MONGODB_PORT=27017
- ME_CONFIG_MONGODB_ADMINUSERNAME=mongodbUser
- ME_CONFIG_MONGODB_ADMINPASSWORD=mongodbPass
- ME_CONFIG_BASICAUTH_USERNAME=expressUser
- ME_CONFIG_BASICAUTH_PASSWORD=expressPass
- ME_CONFIG_MONGODB_ADMINUSERNAME=admin
- ME_CONFIG_MONGODB_ADMINPASSWORD=admin
- ME_CONFIG_BASICAUTH_USERNAME=express
- ME_CONFIG_BASICAUTH_PASSWORD=express
- ME_CONFIG_MONGODB_ENABLE_ADMIN=true
- ME_CONFIG_OPTIONS_EDITORTHEME=default
ports:
@ -32,8 +32,8 @@ services:
node:
depends_on:
- mongodb
image: avaliacao-imovel-rural/air-backend
container_name: air-backend
image: yutsuo/mern-todo-backend
container_name: mern-todo-backend
build:
context: .
args:
@ -42,17 +42,11 @@ services:
- http_proxy=http://192.168.128.1:3128
- https_proxy=http://192.168.128.1:3128
ports:
- "3001:3001"
env_file:
- .env
environment:
- NODEJS_HOST=0.0.0.0
- NODEJS_PORT=3001
- MONGO_DB_HOST=mongodb
- MONGO_DB_PORT=27017
- MONGO_DB_URL=mongodb://mongodb:27017/analise-agro?authSource=admin
- MONGO_DB_USER=mongodbUser
- MONGO_DB_PWD=mongodbPass
- "4000:4000"
volumes:
- .:/usr/src/app
command:
["npm", "run", "watch"]
networks:
default:

6
src/server.js

@ -15,11 +15,11 @@ app.listen(PORT, () => {
console.log(`Server is running on Port: ${PORT}`)
})
mongoose.connect('mongodb://localhost:27017/todos?authSource=admin', {
mongoose.connect('mongodb://mongodb:27017/todos?authSource=admin', {
useNewUrlParser: true,
useUnifiedTopology: true,
user: "mongodbUser",
pass: "mongodbPass"
user: "admin",
pass: "admin"
})
const connection = mongoose.connection

Loading…
Cancel
Save