From 8bd2abcccbda59cefeb30f6cbc49eaf48b181e89 Mon Sep 17 00:00:00 2001 From: maslow Date: Thu, 2 Jun 2022 19:18:39 +0800 Subject: [PATCH] feat(deploy): use nip.io domain instead of local-dev.host --- deploy/README.md | 35 +++++++---------------------------- deploy/docker-compose/.env | 6 +++--- deploy/kubernetes/config.yml | 6 +++--- deploy/kubernetes/ingress.yml | 16 ++++++++-------- docker-compose.yml | 14 +++++++------- 5 files changed, 28 insertions(+), 49 deletions(-) diff --git a/deploy/README.md b/deploy/README.md index 04ab26ea..63c04a7e 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -1,25 +1,13 @@ # 安装教程 -### 快速部署 `laf.js` 服务 +### 快速部署 `laf` -> 基于 Docker Compose 快速部署，需要你熟悉 Docker 以及 docker-compose 的使用。 +> 基于 Docker Compose 快速部署，需要你熟悉 Docker 以及 Docker Compose 的使用。 -##### 安装 Docker (CentOS) +##### 安装 Docker -> 本例只给出 CentOS 下的安装脚本，若安装其它环境请参考官方文档 https://docs.docker.com/engine/install/。 - -```sh -sudo yum install -y yum-utils -sudo yum-config-manager \ - --add-repo \ - https://download.docker.com/linux/centos/docker-ce.repo - -sudo yum install docker-ce docker-ce-cli containerd.io -sudo systemctl start docker - -``` - -> 还需安装 docker-compose @see https://docs.docker.com/compose/install/。 +- 安装 Docker: https://docs.docker.com/engine/install/ +- 安装 Docker Compose: https://docs.docker.com/compose/install/ ##### 启动服务（docker-compose） @@ -34,14 +22,9 @@ docker pull lafyun/app-service:latest # 启动所有服务 docker-compose up -# 浏览器打开 http://console.local-dev.host:8000 访问 +# 浏览器打开 http://console.127-0-0-1.nip.io:8000 访问 ``` -> TIPs: -> We provide `*.local-dev.host` always resolved to `127.0.0.1` anywhere! -> Close your VPN then `local-dev.host` resolving works well. - - ### 开发环境（开发者） ```sh @@ -60,14 +43,10 @@ docker pull lafyun/app-service:latest # launch laf.js services docker-compose up -# Now open http://console.local-dev.host:8080 in your browsers! +# Now open http://console.127-0-0-1.nip.io:8080 in your browsers! ``` -> TIPs: -> We provide `*.local-dev.host` always resolved to `127.0.0.1` anywhere! -> Close your VPN then `local-dev.host` resolving works well. - ## 测试用例 ### 启动 MongoDB 测试容器 diff --git a/deploy/docker-compose/.env b/deploy/docker-compose/.env index b8564b7f..1e011390 100644 --- a/deploy/docker-compose/.env +++ b/deploy/docker-compose/.env @@ -23,9 +23,9 @@ APP_SERVICE_DEPLOY_URL_SCHEMA=http # `*.local-dev.host` always resolved to 127.0.0.1, just for local development # Replace it with your own domain which should be resolved(*.domain.com) to your server ip -DEPLOY_DOMAIN=local-dev.host -SYS_CLIENT_HOST=console.local-dev.host -OSS_DOMAIN=oss.local-dev.host +DEPLOY_DOMAIN=127-0-0-1.nip.io +SYS_CLIENT_HOST=console.127-0-0-1.nip.io +OSS_DOMAIN=oss.127-0-0-1.nip.io APP_SERVICE_IMAGE=lafyun/app-service:latest SYSTEM_EXTENSION_APPID='000000' \ No newline at end of file diff --git a/deploy/kubernetes/config.yml b/deploy/kubernetes/config.yml index 49852736..695b0144 100644 --- a/deploy/kubernetes/config.yml +++ b/deploy/kubernetes/config.yml @@ -20,9 +20,9 @@ data: minio-root-user: "minio-root-user" minio-root-password: "minio-root-password" minio-region-name: "cn-default" - minio-domain: "oss.local-dev.host" + minio-domain: "oss.127-0-0-1.nip.io" internal-endpoint: "http://oss:9000" - external-endpoint: "http://oss.local-dev.host" + external-endpoint: "http://oss.127-0-0-1.nip.io" ### Root account for system extension app @@ -54,7 +54,7 @@ metadata: name: deploy-domain namespace: laf data: - app-service-host: "local-dev.host" # `*.local-dev.host` always resolved to 127.0.0.1, used to local development + app-service-host: "127-0-0-1.nip.io" # `*.127-0-0-1.nip.io` always resolved to 127.0.0.1, used to local development deploy-url-schema: "http" ### App service config & default quotas diff --git a/deploy/kubernetes/ingress.yml b/deploy/kubernetes/ingress.yml index e0993066..5cac164c 100644 --- a/deploy/kubernetes/ingress.yml +++ b/deploy/kubernetes/ingress.yml @@ -10,7 +10,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: minio.local-dev.host + - host: minio.127-0-0-1.nip.io http: paths: - path: / @@ -41,7 +41,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: oss.local-dev.host + - host: oss.127-0-0-1.nip.io http: paths: - path: / @@ -72,7 +72,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: "*.oss.local-dev.host" + - host: "*.oss.127-0-0-1.nip.io" http: paths: - path: / @@ -95,7 +95,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: console.local-dev.host + - host: console.127-0-0-1.nip.io http: paths: - path: / @@ -118,7 +118,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: console.local-dev.host + - host: console.127-0-0-1.nip.io http: paths: - path: /app-console/(.*) @@ -142,7 +142,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: console.local-dev.host + - host: console.127-0-0-1.nip.io http: paths: - path: /sys-api/(.*) @@ -166,7 +166,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: console.local-dev.host + - host: console.127-0-0-1.nip.io http: paths: - path: /sys-extension-api/(.*) @@ -216,4 +216,4 @@ metadata: spec: ingressClassName: nginx rules: - - host: "*.local-dev.host" \ No newline at end of file + - host: "*.127-0-0-1.nip.io" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index be4f3701..6b542e90 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: - MINIO_DISTRIBUTED_NODES=oss/data/{0...3} - MINIO_SKIP_CLIENT=yes - MINIO_REGION_NAME=cn-default - - MINIO_DOMAIN=oss.local-dev.host + - MINIO_DOMAIN=oss.127-0-0-1.nip.io ports: - "9020:9000" - "9120:9001" @@ -49,12 +49,12 @@ services: LOG_LEVEL: debug ACCOUNT_DEFAULT_APP_QUOTA: 5 APP_SERVICE_IMAGE: lafyun/app-service:latest - APP_SERVICE_DEPLOY_HOST: local-dev.host:8080 # `*.local-dev.host` always resolved to 127.0.0.1, used to local development + APP_SERVICE_DEPLOY_HOST: 127-0-0-1.nip.io:8080 # `*.127-0-0-1.nip.io` always resolved to 127.0.0.1, used to local development APP_SERVICE_DEPLOY_URL_SCHEMA: 'http' MINIO_ACCESS_KEY: minio-root-user MINIO_ACCESS_SECRET: minio-root-password MINIO_INTERNAL_ENDPOINT: http://oss:9000 - MINIO_EXTERNAL_ENDPOINT: http://oss.local-dev.host:8080 + MINIO_EXTERNAL_ENDPOINT: http://oss.127-0-0-1.nip.io:8080 MINIO_REGION_NAME: cn-default INIT_ROOT_ACCOUNT_PASSWORD: abc123 INIT_ROOT_ACCOUNT: root @@ -87,7 +87,7 @@ services: SERVICE_DRIVER: docker APP_SERVICE_ENV_NPM_INSTALL_FLAGS: '--registry=https://registry.npm.taobao.org --no-audit --no-fund' MINIO_INTERNAL_ENDPOINT: http://oss:9000 - MINIO_EXTERNAL_ENDPOINT: http://oss.local-dev.host:8080 + MINIO_EXTERNAL_ENDPOINT: http://oss.127-0-0-1.nip.io:8080 MINIO_REGION_NAME: cn-default DEBUG_BIND_HOST_APP_PATH: '${PWD}/packages/app-service' SYSTEM_EXTENSION_APPID: '000000' @@ -109,9 +109,9 @@ services: - mongo - system-server environment: - DEPLOY_DOMAIN: "*.local-dev.host" # `*.local-dev.host` always resolved to 127.0.0.1, used to local development - DEPLOY_OSS_DOMAIN: "oss.local-dev.host" - SYS_CLIENT_HOST: console.local-dev.host + DEPLOY_DOMAIN: "*.127-0-0-1.nip.io" # `*.127-0-0-1.nip.io` always resolved to 127.0.0.1, used to local development + DEPLOY_OSS_DOMAIN: "oss.127-0-0-1.nip.io" + SYS_CLIENT_HOST: console.127-0-0-1.nip.io SYSTEM_EXTENSION_APPID: '000000' volumes: - ./packages/gateway/scripts:/scripts