Commit 0a8f67ce by MichaelJier

private

1. 新增cbn私有化配置
parent a3bfbd96
...@@ -29,4 +29,19 @@ vvku: ...@@ -29,4 +29,19 @@ vvku:
location: live location: live
command: command:
build: build:vvku build: build:vvku
\ No newline at end of file
cbn:
config:
spa: false
ssr: true
folder: nuxt-dist
proxy: http://172.18.0.1:3000
server: /web\.cbnbn\.cn/
target:
project: Web
location: live
command:
build: build:cbn
\ No newline at end of file
FROM alpine AS builder
WORKDIR /home/app
RUN apk add --no-cache --update nodejs yarn
COPY package.json yarn.lock ./
RUN yarn install --registry=https://registry.yarnpkg.com
FROM registry.cn-hangzhou.aliyuncs.com/open_images/node12.13.1-pm2
ADD ./ /var/www/web_live
ENV HOST 0.0.0.0
ENV TZ Asia/Shanghai
WORKDIR /var/www/web_live
COPY --from=builder /home/app/package.json ./package.json
COPY --from=builder /home/app/node_modules ./node_modules
RUN yarn build:cbn
RUN rm -rf assets components layouts middleware pages plugins store .eslintrc.js .gitignore build.yml Dockerfile README.md start.sh
EXPOSE 3000
RUN chmod +x cbnStart.sh
ENTRYPOINT ["./cbnStart.sh"]
#!/bin/sh
yarn run pm2:cbn
while true
do
sleep 5;
done
\ No newline at end of file
module.exports = {
DEF_DOMAIM: '//cgateway.cbnbn.cn',
DEF_OSS: '//static.cbnbn.cn',
DEF_AODIANYUN: 'http://cdn.cbnbn.cn',
DEF_S_AODIANYUN: 'https://cdn.cbnbn.cn',
HTTPS_PORT: '',
HTTP_PORT: '',
X_CA_STAGE: '',
private: true,
sentryOptions: {},
uploaderName: 'tencent',
uploaderOptions: {
accessKeyId: 'AKID9490ayCf3OTntr6mTxFT5KJ3d6LRrUQA',
accessKeySecret: 'dgW7YphKSMZmkSxBcAWpeomlgQ9dhW9c',
endpoint: 'gallery-1259144018.cos.ap-beijing.myqcloud.com',
bucket: 'gallery-1259144018',
cname: 'gallery.cbnbn.cn',
multiFiles: true,
region: 'ap-beijing'
},
DEF_SITE: '//web.cbnbn.cn',
};
...@@ -8,21 +8,25 @@ ...@@ -8,21 +8,25 @@
"serve": "nuxt", "serve": "nuxt",
"serve:cm": "cross-env mode=cm.private nuxt", "serve:cm": "cross-env mode=cm.private nuxt",
"serve:vvku": "cross-env mode=vvku.private nuxt", "serve:vvku": "cross-env mode=vvku.private nuxt",
"serve:cbn": "cross-env mode=cbn.private nuxt",
"serve:pre": "cross-env mode=pre nuxt", "serve:pre": "cross-env mode=pre nuxt",
"serve:test": "cross-env mode=test nuxt", "serve:test": "cross-env mode=test nuxt",
"build": "nuxt build", "build": "nuxt build",
"build:cm": "cross-env mode=cm.private nuxt build", "build:cm": "cross-env mode=cm.private nuxt build",
"build:vvku": "cross-env mode=vvku.private nuxt build", "build:vvku": "cross-env mode=vvku.private nuxt build",
"build:cbn": "cross-env mode=cbn.private nuxt build",
"build:pre": "cross-env mode=pre nuxt build", "build:pre": "cross-env mode=pre nuxt build",
"build:test": "cross-env mode=test nuxt build", "build:test": "cross-env mode=test nuxt build",
"start": "nuxt start", "start": "nuxt start",
"start:vvku": "cross-env mode=vvku.private nuxt start", "start:vvku": "cross-env mode=vvku.private nuxt start",
"start:cm": "cross-env mode=cm.private nuxt start", "start:cm": "cross-env mode=cm.private nuxt start",
"start:cbn": "cross-env mode=cbn.private nuxt start",
"start:pre": "cross-env mode=pre nuxt start", "start:pre": "cross-env mode=pre nuxt start",
"start:test": "cross-env mode=test nuxt start", "start:test": "cross-env mode=test nuxt start",
"pm2": "pm2 start pm2.json --only live", "pm2": "pm2 start pm2.json --only live",
"pm2:cm": "pm2 start pm2.json --only live-cm", "pm2:cm": "pm2 start pm2.json --only live-cm",
"pm2:vvku": "pm2 start pm2.json --only live-vvku", "pm2:vvku": "pm2 start pm2.json --only live-vvku",
"pm2:cbn": "pm2 start pm2.json --only live-cbn",
"pm2:pre": "pm2 start pm2.json --only live-pre", "pm2:pre": "pm2 start pm2.json --only live-pre",
"pm2:test": "pm2 start pm2.json --only live-test", "pm2:test": "pm2 start pm2.json --only live-test",
"generate": "nuxt generate", "generate": "nuxt generate",
...@@ -31,7 +35,7 @@ ...@@ -31,7 +35,7 @@
}, },
"dependencies": { "dependencies": {
"@gdyfe/ink-marks": "^1.1.0", "@gdyfe/ink-marks": "^1.1.0",
"@gdyfe/uploader": "^2.1.6", "@gdyfe/uploader": "^2.2.2",
"@nuxtjs/axios": "^5.3.6", "@nuxtjs/axios": "^5.3.6",
"@nuxtjs/component-cache": "^1.1.5", "@nuxtjs/component-cache": "^1.1.5",
"@nuxtjs/google-gtag": "^1.0.4", "@nuxtjs/google-gtag": "^1.0.4",
......
...@@ -61,6 +61,21 @@ ...@@ -61,6 +61,21 @@
"out_file": "./logs/app-out.log" "out_file": "./logs/app-out.log"
}, },
{ {
"name": "live-cbn",
"script": "npm",
"args": "run start:cbn",
"instances": "max",
"exec_mode": "cluster",
"autorestart": true,
"max_memory_restart": "8G",
"env": {
"port": 3000,
"NODE_ENV": "production"
},
"error_file": "./logs/app-err.log",
"out_file": "./logs/app-out.log"
},
{
"name": "live", "name": "live",
"script": "npm", "script": "npm",
"args": "run start", "args": "run start",
......
...@@ -2135,14 +2135,15 @@ ...@@ -2135,14 +2135,15 @@
dayjs "^1.8.34" dayjs "^1.8.34"
pako "^1.0.11" pako "^1.0.11"
"@gdyfe/uploader@^2.1.6": "@gdyfe/uploader@^2.2.2":
version "2.1.6" version "2.2.2"
resolved "https://registry.yarnpkg.com/@gdyfe/uploader/-/uploader-2.1.6.tgz#bea1042ec59bef3b397ef5a1137f14cfe8086f1a" resolved "https://registry.yarnpkg.com/@gdyfe/uploader/-/uploader-2.2.2.tgz#92222c2746bdddc86efc7e72e34bbef18e378590"
integrity sha512-hkFMN+ljPrYFbm427uvKuplU2GNiUaGYKTjHNjWbtkKbRXR2Od3WCPYLPh7qJdtQe1DZXWQjnLEyW2XSuJh6qQ== integrity sha512-PUzGOTRADaVSP0h0hu7/aFjcnWusdpJEuuKOFLpj2yCNjgADAwox7DJBirlT8fcbFZECTyz4kX/rmHabluBbfg==
dependencies: dependencies:
ali-oss "^6.11.1" ali-oss "^6.11.1"
aws-amplify "^3.3.7" aws-amplify "^3.3.7"
aws-sdk "^2.762.0" aws-sdk "^2.762.0"
cos-js-sdk-v5 "^1.1.5"
dayjs "^1.9.1" dayjs "^1.9.1"
object-hash "^2.0.3" object-hash "^2.0.3"
...@@ -4344,6 +4345,13 @@ core-util-is@^1.0.2, core-util-is@~1.0.0: ...@@ -4344,6 +4345,13 @@ core-util-is@^1.0.2, core-util-is@~1.0.0:
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
cos-js-sdk-v5@^1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/cos-js-sdk-v5/-/cos-js-sdk-v5-1.1.5.tgz#af92d4714026543bb94d02db9d157a9ef3df5ad0"
integrity sha512-7KJpqGFSu9HZ2w+dZv4ixeQzJ59NL0uoB1JyI6QehxHHAzM6sMZSw0IDQ1ZeE/4XQQELL7yx6OK4U97m3XK4Ww==
dependencies:
xmldom "^0.1.31"
cosmiconfig@^5.0.0: cosmiconfig@^5.0.0:
version "5.2.1" version "5.2.1"
resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
...@@ -11208,6 +11216,11 @@ xmlbuilder@~9.0.1: ...@@ -11208,6 +11216,11 @@ xmlbuilder@~9.0.1:
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
xmldom@^0.1.31:
version "0.1.31"
resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
xregexp@2.0.0: xregexp@2.0.0:
version "2.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment