From ba236e5560a024d23db2870d292a6d2df5fc6c76 Mon Sep 17 00:00:00 2001 From: Edwin Betancourt Date: Fri, 5 Jun 2020 16:59:19 -0400 Subject: [PATCH 1/6] feat: Add run production mode with docker-compose. --- .dockerignore | 24 ++++++++++++++++++++++++ Dockerfile | 17 +++++++++++++++++ docker-compose.yaml | 20 ++++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 .dockerignore create mode 100644 Dockerfile create mode 100644 docker-compose.yaml diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..bb964a14 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,24 @@ +.DS_Store +node_modules/ +vendor/ +dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +**/*.log + +tests/**/coverage/ +tests/e2e/reports +selenium-debug.log + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.local + +package-lock.json +yarn.lock diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..3fe7954f --- /dev/null +++ b/Dockerfile @@ -0,0 +1,17 @@ +FROM node:10 + +# Create app directory +WORKDIR /usr/app + +# Copy project files +COPY . ./ + +# Install app dependencies +# A wildcard is used to ensure both package.json AND package-lock.json are copied +# where available (npm@5+) +RUN npm install \ + && npm run build:prod +# Build state files + +# Start builded application +CMD npm run preview diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 00000000..ce6dc517 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,20 @@ +version: '3.7' + +services: + web-client: + build: + context: . + dockerfile: ./Dockerfile + container_name: vue-element-admin + network_mode: bridge + build: . + volumes: + - /usr/app/ + - /usr/app/node_modules + labels: + - app=vue-element-admin + stdin_open: true + tty: true + ports: + - 9526:9526 # Prod + # - 9527:9527 # Dev From 05121c5fa5a758a17179df1e504926758cd9205b Mon Sep 17 00:00:00 2001 From: Edwin Betancourt Date: Tue, 9 Jun 2020 17:09:39 -0400 Subject: [PATCH 2/6] minimal changes. --- Dockerfile | 2 +- docker-compose.yaml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3fe7954f..15457d5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:10 +FROM node:12 # Create app directory WORKDIR /usr/app diff --git a/docker-compose.yaml b/docker-compose.yaml index ce6dc517..f50a56d0 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.7' +version: '3.8' services: web-client: @@ -17,4 +17,3 @@ services: tty: true ports: - 9526:9526 # Prod - # - 9527:9527 # Dev From 015237570be78e33010c48d9a71ccb0ff15fb0a0 Mon Sep 17 00:00:00 2001 From: Edwin Betancourt Date: Tue, 9 Jun 2020 17:23:00 -0400 Subject: [PATCH 3/6] add docker documentation. --- README.es.md | 7 +++++++ README.ja.md | 7 +++++++ README.md | 7 +++++++ README.zh-CN.md | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/README.es.md b/README.es.md index 472adb60..57e14b2d 100644 --- a/README.es.md +++ b/README.es.md @@ -187,6 +187,13 @@ npm run lint npm run lint -- --fix ``` +## Contenedor Docker + +```bash +# requiere permisos de superusuario del sistema operativo ('su' o 'sudo') +docker-componer up +``` + Vaya a [Documentación](https://panjiachen.github.io/vue-element-admin-site/guide/essentials/deploy.html) para mayor información ## Registro de Cambios diff --git a/README.ja.md b/README.ja.md index 28ed674c..01de816a 100644 --- a/README.ja.md +++ b/README.ja.md @@ -183,6 +183,13 @@ npm run lint npm run lint -- --fix ``` +## Dockerコンテナ + +```bash +＃オペレーティングシステムのスーパーユーザー権限が必要（ 'su'または 'sudo'） +docker-compose up +``` + 詳細は [Documentation](https://panjiachen.github.io/vue-element-admin-site/guide/essentials/deploy.html) を参照してください。 ## Changelog diff --git a/README.md b/README.md index 5067b8d3..b2399761 100644 --- a/README.md +++ b/README.md @@ -187,6 +187,13 @@ npm run lint npm run lint -- --fix ``` +## Docker Container + +```bash +# requires superuser permissions of the operating system ('su' or 'sudo') +docker-compose up +``` + Refer to [Documentation](https://panjiachen.github.io/vue-element-admin-site/guide/essentials/deploy.html) for more information ## Changelog diff --git a/README.zh-CN.md b/README.zh-CN.md index d429b91e..256ec70f 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -205,6 +205,13 @@ npm run lint npm run lint -- --fix ``` +## Docker容器 + +```bash +# 需要操作系统的超级用户权限（“ su”或“ sudo”） +docker-compose up +``` + 更多信息请参考 [使用文档](https://panjiachen.github.io/vue-element-admin-site/zh/) ## Changelog From fdc16cdc34ab5460ea9eb12ab69882f3cd4e845e Mon Sep 17 00:00:00 2001 From: Edwin Betancourt Date: Tue, 9 Jun 2020 17:43:37 -0400 Subject: [PATCH 4/6] fix version. --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index f50a56d0..95ace904 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.8' +version: '3.7' services: web-client: From a590227ff99794e9c373f1c772bc11e1d65b316d Mon Sep 17 00:00:00 2001 From: Edwin Betancourt Date: Tue, 16 Jun 2020 10:17:34 -0400 Subject: [PATCH 5/6] Update docker-compose.yaml --- docker-compose.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 95ace904..8eb60514 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -7,7 +7,6 @@ services: dockerfile: ./Dockerfile container_name: vue-element-admin network_mode: bridge - build: . volumes: - /usr/app/ - /usr/app/node_modules From e7c2b6c4530559ebaaaf5c5e912ddf4672f36bb2 Mon Sep 17 00:00:00 2001 From: Edwin Betancourt Date: Thu, 27 Aug 2020 11:04:52 -0400 Subject: [PATCH 6/6] Change docker image using alpine version Change docker image from node:12 to node:12-alpine --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 15457d5b..141bf286 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12 +FROM node:12-alpine # Create app directory WORKDIR /usr/app