diff --git a/docker/docker-compose.release.yml b/docker/docker-compose.release.yml new file mode 100644 index 00000000..783e4953 --- /dev/null +++ b/docker/docker-compose.release.yml @@ -0,0 +1,25 @@ +version: "3.5" + +services: + infini-logging-release: + # option 1: pull image from infini docker registry + image: docker.infini.ltd:64443/nodejs-release:latest + + # option 2: build image locally + # build: + # context: ../ + # dockerfile: docker/Dockerfile + + ports: + - 3000:3000 + - 7001:7001 + - 10000:10000 + container_name: "infini-nodejs-release" + volumes: + - ../app:/usr/src/app/app + - ../config:/usr/src/app/config + - ../package.json:/usr/src/app/package.json + - ./entrypoint-release.sh:/entrypoint.sh + +volumes: + dist: \ No newline at end of file diff --git a/docker/entrypoint-release.sh b/docker/entrypoint-release.sh new file mode 100644 index 00000000..e03429b6 --- /dev/null +++ b/docker/entrypoint-release.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +lockPath="/tmp/init.lock" + +npm config set registry http://registry.npm.taobao.org/; + +cd /usr/src/app + +echo "START BUILD INFINI-LOGGING-CENTER v1.0" + +if [ ! -f "$lockPath" ]; then + npm install --registry=https://registry.npm.taobao.org + npm run build + npm run start +else + npm run build + npm run start +fi diff --git a/package.json b/package.json index e4c32357..dcbb59d2 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "node": ">=8.9.0" }, "scripts": { - "start": "egg-scripts start --daemon --title=infini-logging-center --env prod", + "start": "egg-scripts start --title=infini-logging-center --env prod", "stop": "egg-scripts stop --title=infini-logging-center", "dev": "SOCKET_SERVER=none UMI_UI=none egg-bin dev", "local-dev": "egg-bin dev", @@ -85,9 +85,13 @@ "ci": "npm run lint && npm run cov", "autod": "autod", "sync": "./script/sync.js", - "docker:build": "docker-compose -f ./docker/docker-compose.dev.yml build", + "docker:build-dev-images": "docker-compose -f ./docker/docker-compose.dev.yml build", "docker:dev": "docker-compose -f ./docker/docker-compose.dev.yml up -d", - "docker:stop": "docker-compose -f ./docker/docker-compose.dev.yml down" + "docker:stop-dev": "docker-compose -f ./docker/docker-compose.dev.yml down", + "docker:build-release-images": "docker-compose -f ./docker/docker-compose.release.yml build", + "docker:prod": "docker-compose -f ./docker/docker-compose.release.yml up -d", + "docker:stop-prod": "docker-compose -f ./docker/docker-compose.release.yml up down" + }, "ci": { "version": "8",