From 320112d8a7a2894830140108d876413492467d93 Mon Sep 17 00:00:00 2001 From: Matias Date: Sun, 28 Apr 2019 10:06:11 -0300 Subject: [PATCH 1/4] Adding current deploy config --- server/Dockerfile.prod | 23 +++++++++++++++++++++++ server/docker-compose.prod.yml | 24 ++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 server/Dockerfile.prod create mode 100644 server/docker-compose.prod.yml diff --git a/server/Dockerfile.prod b/server/Dockerfile.prod new file mode 100644 index 000000000..6f2cd3865 --- /dev/null +++ b/server/Dockerfile.prod @@ -0,0 +1,23 @@ +FROM mhart/alpine-node:8 + +ENV PORT=4003 + +RUN mkdir -p /var/www/app && \ + mkdir -p /var/www/app/node_modules && \ + mkdir -p /root/.kube + +# Use app directory as current workdir +WORKDIR /var/www/app +ENV PATH /var/www/app/node_modules/.bin:$PATH +# Copy package.json to workdir +COPY package.json /var/www/app/package.json + +# Install dependencies +RUN npm install + +# Copy application code +COPY . /var/www/app +COPY ./config /root/.kube + +# Expose Port +EXPOSE $PORT diff --git a/server/docker-compose.prod.yml b/server/docker-compose.prod.yml new file mode 100644 index 000000000..b0a9490f7 --- /dev/null +++ b/server/docker-compose.prod.yml @@ -0,0 +1,24 @@ +version: '3' +services: + node: + image: aaoperationsapi-dev:v1 + build: + context: . + dockerfile: ./Dockerfile + env_file: ./.env + container_name: aaoperationsapi + tty: true + stdin_open: true + volumes: + - ./:/var/www/app + - /var/www/app/node_modules + working_dir: /var/www/app + restart: always + command: npm start + expose: + - 4003 + network_mode: webproxy +networks: + default: + external: + name: webproxy From bcaf68658b57e6d3fc4adb6b653add0ac2e4a968 Mon Sep 17 00:00:00 2001 From: Matias Date: Sun, 28 Apr 2019 10:06:54 -0300 Subject: [PATCH 2/4] Adding new deploy configuration --- server/.gitignore | 11 +---------- server/Dockerfile | 25 +++++++++++++++++++++++++ server/package.json | 8 ++++++-- server/src/index.js | 2 +- 4 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 server/Dockerfile diff --git a/server/.gitignore b/server/.gitignore index cd5f56af4..734d8b3c1 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -6,14 +6,8 @@ # testing /coverage -# production -/build - -/logs - # misc .env -.DS_Store .env.local .env.development.local .env.test.local @@ -22,7 +16,4 @@ npm-debug.log* yarn-debug.log* yarn-error.log* - -#Docker -Dockerfile -docker-compose.prod.yml +config diff --git a/server/Dockerfile b/server/Dockerfile new file mode 100644 index 000000000..0ac989a2c --- /dev/null +++ b/server/Dockerfile @@ -0,0 +1,25 @@ +FROM mhart/alpine-node:12 + +# Directory where the service will be installed +ARG API_DIR=/usr/src/clonesapi + +# Prepare required directories +RUN mkdir -p ${API_DIR} && \ + mkdir -p /root/.kube + +# Use app directory as current workdir +WORKDIR ${API_DIR} +# ENV PATH /var/www/app/node_modules/.bin:$PATH + +# Copy package.json to workdir +COPY package*.json ${API_DIR}/ + +# Install dependencies +RUN npm install --production + +# Copy application code +COPY . ${API_DIR} +COPY ./config /root/.kube + +# Expose Port +EXPOSE $PORT diff --git a/server/package.json b/server/package.json index 5755b4a57..a0e1b8384 100644 --- a/server/package.json +++ b/server/package.json @@ -1,7 +1,11 @@ { - "name": "operations-server", + "name": "clones-api", "version": "1.0.0", - "description": "Superalgos Operations backend API", + "description": "Superalgos Clones backend API", + "repository": { + "type": "git", + "url": "https://github.com/Superalgos/OperationsModule.git" + }, "main": "src/index.js", "scripts": { "start": "nodemon --exec babel-node --presets env,stage-2 src/index.js", diff --git a/server/src/index.js b/server/src/index.js index 4d3e7c7a4..5fc1d6a81 100644 --- a/server/src/index.js +++ b/server/src/index.js @@ -21,7 +21,7 @@ app.post('/graphql', (req, res, next) => { app.use(cors()) // Database Connection -mongoose.connect(`mongodb://${process.env.DB_USERNAME}:${process.env.DB_PASSWORD}@${process.env.DB_DOMAIN}`, { useNewUrlParser: true }) +mongoose.connect(process.env.MONGO_URL, { useNewUrlParser: true }) mongoose.connection.once('open', () => { logger.info('Connected to the DB.') From bf4d8dc27039ae6048b854cde1ab23cc268ed4a0 Mon Sep 17 00:00:00 2001 From: Matias Date: Sun, 28 Apr 2019 10:44:26 -0300 Subject: [PATCH 3/4] Standard names --- server/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/Dockerfile b/server/Dockerfile index 0ac989a2c..332ffe27b 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -1,7 +1,7 @@ FROM mhart/alpine-node:12 # Directory where the service will be installed -ARG API_DIR=/usr/src/clonesapi +ARG API_DIR=/usr/src/clones-api # Prepare required directories RUN mkdir -p ${API_DIR} && \ @@ -9,7 +9,6 @@ RUN mkdir -p ${API_DIR} && \ # Use app directory as current workdir WORKDIR ${API_DIR} -# ENV PATH /var/www/app/node_modules/.bin:$PATH # Copy package.json to workdir COPY package*.json ${API_DIR}/ From a957994efdec7c4c7552684b90e8d4ddf048f794 Mon Sep 17 00:00:00 2001 From: Matias Date: Tue, 30 Apr 2019 11:27:33 -0300 Subject: [PATCH 4/4] New version of the clone executor --- server/src/config/clone-deployment.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/config/clone-deployment.json b/server/src/config/clone-deployment.json index 81dfed657..11fc359db 100644 --- a/server/src/config/clone-deployment.json +++ b/server/src/config/clone-deployment.json @@ -14,7 +14,7 @@ "containers": [ { "name": "clone-executor", - "image": "superalgos/clone-executor:1.0.3", + "image": "superalgos/clone-executor:1.0.4", "command": ["node", "Run.js"], "env": [ ]