diff --git a/packages/generator-nitro/generators/app/index.js b/packages/generator-nitro/generators/app/index.js index e57067f9..2735f67e 100644 --- a/packages/generator-nitro/generators/app/index.js +++ b/packages/generator-nitro/generators/app/index.js @@ -316,8 +316,6 @@ module.exports = class extends Generator { 'src/proto.ts', 'tests/cypress/cypress/e2e/examples/index.cy.js', '.eslintrc.js', - 'docker-compose.yml', - 'docker-compose-dev.yml', 'gulpfile.js', 'CUTAWAYpackage.json', ]; diff --git a/packages/generator-nitro/generators/app/templates/.dockerignore b/packages/generator-nitro/generators/app/templates/.dockerignore deleted file mode 100644 index 3cee00bc..00000000 --- a/packages/generator-nitro/generators/app/templates/.dockerignore +++ /dev/null @@ -1,10 +0,0 @@ -.git -.idea -.vscode -dist -node_modules -project/docs -project/tmp -public/assets -public/reports -npm-debug.log diff --git a/packages/generator-nitro/generators/app/templates/CUTAWAYpackage.json b/packages/generator-nitro/generators/app/templates/CUTAWAYpackage.json index 04913360..3f044f88 100644 --- a/packages/generator-nitro/generators/app/templates/CUTAWAYpackage.json +++ b/packages/generator-nitro/generators/app/templates/CUTAWAYpackage.json @@ -66,14 +66,8 @@ "prod:serve": "cross-env NODE_ENV=production nitro-app-serve",<% if (options.themes) { %> "start": "npm run start:light", "start:light": "cross-env THEME=light PORT=8081 PROXY=8082 npm run dev", - "start:dark": "cross-env THEME=dark PORT=8083 PROXY=8084 npm run dev",<% } else { %> - "start": "npm run dev",<% } %> - "\n# DOCKER ------- ": "", - "docker:update": "docker-compose build", - "docker:start": "npm run docker:dev:start", - "docker:dev:start": "docker-compose -f docker-compose-dev.yml up", - "docker:dev:console": "docker exec -it <%= name %>_server-dev bash", - "docker:prod": "docker-compose up" + "start:dark": "cross-env THEME=dark PORT=8083 PROXY=8084 npm run dev"<% } else { %> + "start": "npm run dev"<% } %> }, "keywords": [ "frontend", diff --git a/packages/generator-nitro/generators/app/templates/docker-compose-dev.yml b/packages/generator-nitro/generators/app/templates/docker-compose-dev.yml deleted file mode 100644 index 8611c3f5..00000000 --- a/packages/generator-nitro/generators/app/templates/docker-compose-dev.yml +++ /dev/null @@ -1,13 +0,0 @@ -# docker-compose.yaml -version: "3" -services: - server: - build: . - container_name: <%= name %>_server-dev - command: npm start - ports: - - 8081:8081 - - 3001:3001 - volumes: - - .:/app:rw - - /app/node_modules diff --git a/packages/generator-nitro/generators/app/templates/docker-compose.yml b/packages/generator-nitro/generators/app/templates/docker-compose.yml deleted file mode 100644 index 26834e0d..00000000 --- a/packages/generator-nitro/generators/app/templates/docker-compose.yml +++ /dev/null @@ -1,9 +0,0 @@ -# docker-compose.yaml for production (prototype) -version: "3" -services: - server: - build: . - container_name: <%= name %>_server - command: npm run prod - ports: - - 8080:8080 diff --git a/packages/generator-nitro/generators/app/templates/project/docs/nitro-docker.md b/packages/generator-nitro/generators/app/templates/project/docs/nitro-docker.md deleted file mode 100644 index 93de8cfd..00000000 --- a/packages/generator-nitro/generators/app/templates/project/docs/nitro-docker.md +++ /dev/null @@ -1,35 +0,0 @@ -# Nitro usage with docker - -This feature is currently in experimental status. - -Of course docker must be installed. - -## Production mode - -To start in production mode (prototype server): - -``` -npm run docker:prod -``` - -## Development mode - -To start in development mode: - -``` -npm run docker:start -``` - -If you need a console to the docker image, run: - -``` -npm run docker:dev:console -``` - -## Update Docker Image - -If you make changes to package.json or the Dockerfile you should recreate the docker image. - -``` -npm run docker:update -``` diff --git a/packages/generator-nitro/generators/app/templates/project/docs/nitro.md b/packages/generator-nitro/generators/app/templates/project/docs/nitro.md index b8a5d947..765d01d1 100644 --- a/packages/generator-nitro/generators/app/templates/project/docs/nitro.md +++ b/packages/generator-nitro/generators/app/templates/project/docs/nitro.md @@ -72,10 +72,6 @@ set PORT=8000 && set PROXY=8001 && npm start set PORT=3001 && npm run prod ``` -### Usage with docker - -For information on how to use Nitro with docker, please refer to [nitro-docker.md](./nitro-docker.md). - ## Configuring ### Config Package diff --git a/packages/generator-nitro/generators/app/templates/readme.md b/packages/generator-nitro/generators/app/templates/readme.md index 2d1a059b..ecaf7e17 100644 --- a/packages/generator-nitro/generators/app/templates/readme.md +++ b/packages/generator-nitro/generators/app/templates/readme.md @@ -25,10 +25,6 @@ and start in development mode npm start ``` -### Usage with docker (experimental) - -For information on how to use Nitro with docker, please refer to [nitro-docker.md](./project/docs/nitro-docker.md). - ## Nitro For information on how to use Nitro, please refer to [nitro.md](./project/docs/nitro.md). diff --git a/packages/project-nitro-twig/.dockerignore b/packages/project-nitro-twig/.dockerignore deleted file mode 100644 index 3cee00bc..00000000 --- a/packages/project-nitro-twig/.dockerignore +++ /dev/null @@ -1,10 +0,0 @@ -.git -.idea -.vscode -dist -node_modules -project/docs -project/tmp -public/assets -public/reports -npm-debug.log diff --git a/packages/project-nitro-twig/Dockerfile b/packages/project-nitro-twig/Dockerfile deleted file mode 100644 index 31069e62..00000000 --- a/packages/project-nitro-twig/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM node:10 - -# Backstopjs - https://hub.docker.com/r/backstopjs/backstopjs/dockerfile -ENV \ -PHANTOMJS_VERSION=2.1.16 \ -CASPERJS_VERSION=1.1.4 \ -SLIMERJS_VERSION=1.0.0 \ -BACKSTOPJS_VERSION=3.8.5 \ -# Workaround to fix phantomjs-prebuilt installation errors -# See https://github.com/Medium/phantomjs/issues/707 -NPM_CONFIG_UNSAFE_PERM=true - -# Base packages -RUN apt-get update && \ -apt-get install -y git sudo software-properties-common - -RUN sudo npm install -g --unsafe-perm=true --allow-root phantomjs-prebuilt@${PHANTOMJS_VERSION} -RUN sudo npm install -g --unsafe-perm=true --allow-root casperjs@${CASPERJS_VERSION} -RUN sudo npm install -g --unsafe-perm=true --allow-root slimerjs@${SLIMERJS_VERSION} -RUN sudo npm install -g --unsafe-perm=true --allow-root backstopjs@${BACKSTOPJS_VERSION} - -RUN wget https://dl-ssl.google.com/linux/linux_signing_key.pub && sudo apt-key add linux_signing_key.pub -RUN sudo add-apt-repository "deb http://dl.google.com/linux/chrome/deb/ stable main" - -RUN apt-get -y update && \ -apt-get -y install google-chrome-stable - -RUN apt-get install -y firefox-esr - -# Create app directory -WORKDIR /app - -# Install app dependencies -# A wildcard is used to ensure both package.json AND package-lock.json are copied -COPY package*.json ./ -COPY .npmrc ./ -RUN npm install --ignore-optional - -# Bundle app source -COPY . . - -# Expose and start server -EXPOSE 8080 8081 3001 -CMD [ "npm", "start" ] diff --git a/packages/project-nitro-twig/docker-compose-dev.yml b/packages/project-nitro-twig/docker-compose-dev.yml deleted file mode 100644 index 744b89e7..00000000 --- a/packages/project-nitro-twig/docker-compose-dev.yml +++ /dev/null @@ -1,13 +0,0 @@ -# docker-compose.yaml -version: "3" -services: - server: - build: . - container_name: project-nitro-twig_server-dev - command: npm start - ports: - - 8081:8081 - - 3001:3001 - volumes: - - .:/app:rw - - /app/node_modules diff --git a/packages/project-nitro-twig/docker-compose.yml b/packages/project-nitro-twig/docker-compose.yml deleted file mode 100644 index 10178283..00000000 --- a/packages/project-nitro-twig/docker-compose.yml +++ /dev/null @@ -1,9 +0,0 @@ -# docker-compose.yaml for production (prototype) -version: "3" -services: - server: - build: . - container_name: project-nitro-twig_server - command: npm run prod - ports: - - 8080:8080 diff --git a/packages/project-nitro-twig/package.json b/packages/project-nitro-twig/package.json index 0dc984e1..e3a321c7 100644 --- a/packages/project-nitro-twig/package.json +++ b/packages/project-nitro-twig/package.json @@ -60,13 +60,7 @@ "prod:check": "npm run check-node-version", "prod:build": "npm run build", "prod:serve": "cross-env NODE_ENV=production nitro-app-serve", - "start": "npm run dev", - "\n# DOCKER ------- ": "", - "docker:update": "docker-compose build", - "docker:start": "npm run docker:dev:start", - "docker:dev:start": "docker-compose -f docker-compose-dev.yml up", - "docker:dev:console": "docker exec -it project-nitro-twig_server-dev bash", - "docker:prod": "docker-compose up" + "start": "npm run dev" }, "keywords": [ "frontend", diff --git a/packages/project-nitro-twig/project/docs/nitro-docker.md b/packages/project-nitro-twig/project/docs/nitro-docker.md deleted file mode 100644 index 93de8cfd..00000000 --- a/packages/project-nitro-twig/project/docs/nitro-docker.md +++ /dev/null @@ -1,35 +0,0 @@ -# Nitro usage with docker - -This feature is currently in experimental status. - -Of course docker must be installed. - -## Production mode - -To start in production mode (prototype server): - -``` -npm run docker:prod -``` - -## Development mode - -To start in development mode: - -``` -npm run docker:start -``` - -If you need a console to the docker image, run: - -``` -npm run docker:dev:console -``` - -## Update Docker Image - -If you make changes to package.json or the Dockerfile you should recreate the docker image. - -``` -npm run docker:update -``` diff --git a/packages/project-nitro-twig/project/docs/nitro.md b/packages/project-nitro-twig/project/docs/nitro.md index 3c4fc1a4..7db41793 100644 --- a/packages/project-nitro-twig/project/docs/nitro.md +++ b/packages/project-nitro-twig/project/docs/nitro.md @@ -72,10 +72,6 @@ set PORT=8000 && set PROXY=8001 && npm start set PORT=3001 && npm run prod ``` -### Usage with docker - -For information on how to use Nitro with docker, please refer to [nitro-docker.md](./nitro-docker.md). - ## Configuring ### Config Package diff --git a/packages/project-nitro-twig/readme.md b/packages/project-nitro-twig/readme.md index 2d1a059b..ecaf7e17 100644 --- a/packages/project-nitro-twig/readme.md +++ b/packages/project-nitro-twig/readme.md @@ -25,10 +25,6 @@ and start in development mode npm start ``` -### Usage with docker (experimental) - -For information on how to use Nitro with docker, please refer to [nitro-docker.md](./project/docs/nitro-docker.md). - ## Nitro For information on how to use Nitro, please refer to [nitro.md](./project/docs/nitro.md). diff --git a/packages/project-nitro-typescript/.dockerignore b/packages/project-nitro-typescript/.dockerignore deleted file mode 100644 index 3cee00bc..00000000 --- a/packages/project-nitro-typescript/.dockerignore +++ /dev/null @@ -1,10 +0,0 @@ -.git -.idea -.vscode -dist -node_modules -project/docs -project/tmp -public/assets -public/reports -npm-debug.log diff --git a/packages/project-nitro-typescript/Dockerfile b/packages/project-nitro-typescript/Dockerfile deleted file mode 100644 index 31069e62..00000000 --- a/packages/project-nitro-typescript/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM node:10 - -# Backstopjs - https://hub.docker.com/r/backstopjs/backstopjs/dockerfile -ENV \ -PHANTOMJS_VERSION=2.1.16 \ -CASPERJS_VERSION=1.1.4 \ -SLIMERJS_VERSION=1.0.0 \ -BACKSTOPJS_VERSION=3.8.5 \ -# Workaround to fix phantomjs-prebuilt installation errors -# See https://github.com/Medium/phantomjs/issues/707 -NPM_CONFIG_UNSAFE_PERM=true - -# Base packages -RUN apt-get update && \ -apt-get install -y git sudo software-properties-common - -RUN sudo npm install -g --unsafe-perm=true --allow-root phantomjs-prebuilt@${PHANTOMJS_VERSION} -RUN sudo npm install -g --unsafe-perm=true --allow-root casperjs@${CASPERJS_VERSION} -RUN sudo npm install -g --unsafe-perm=true --allow-root slimerjs@${SLIMERJS_VERSION} -RUN sudo npm install -g --unsafe-perm=true --allow-root backstopjs@${BACKSTOPJS_VERSION} - -RUN wget https://dl-ssl.google.com/linux/linux_signing_key.pub && sudo apt-key add linux_signing_key.pub -RUN sudo add-apt-repository "deb http://dl.google.com/linux/chrome/deb/ stable main" - -RUN apt-get -y update && \ -apt-get -y install google-chrome-stable - -RUN apt-get install -y firefox-esr - -# Create app directory -WORKDIR /app - -# Install app dependencies -# A wildcard is used to ensure both package.json AND package-lock.json are copied -COPY package*.json ./ -COPY .npmrc ./ -RUN npm install --ignore-optional - -# Bundle app source -COPY . . - -# Expose and start server -EXPOSE 8080 8081 3001 -CMD [ "npm", "start" ] diff --git a/packages/project-nitro-typescript/docker-compose-dev.yml b/packages/project-nitro-typescript/docker-compose-dev.yml deleted file mode 100644 index dd4ac7b6..00000000 --- a/packages/project-nitro-typescript/docker-compose-dev.yml +++ /dev/null @@ -1,13 +0,0 @@ -# docker-compose.yaml -version: "3" -services: - server: - build: . - container_name: project-nitro-typescript_server-dev - command: npm start - ports: - - 8081:8081 - - 3001:3001 - volumes: - - .:/app:rw - - /app/node_modules diff --git a/packages/project-nitro-typescript/docker-compose.yml b/packages/project-nitro-typescript/docker-compose.yml deleted file mode 100644 index 913658be..00000000 --- a/packages/project-nitro-typescript/docker-compose.yml +++ /dev/null @@ -1,9 +0,0 @@ -# docker-compose.yaml for production (prototype) -version: "3" -services: - server: - build: . - container_name: project-nitro-typescript_server - command: npm run prod - ports: - - 8080:8080 diff --git a/packages/project-nitro-typescript/package.json b/packages/project-nitro-typescript/package.json index b5623201..6a7a3973 100644 --- a/packages/project-nitro-typescript/package.json +++ b/packages/project-nitro-typescript/package.json @@ -60,13 +60,7 @@ "prod:check": "npm run check-node-version", "prod:build": "npm run build", "prod:serve": "cross-env NODE_ENV=production nitro-app-serve", - "start": "npm run dev", - "\n# DOCKER ------- ": "", - "docker:update": "docker-compose build", - "docker:start": "npm run docker:dev:start", - "docker:dev:start": "docker-compose -f docker-compose-dev.yml up", - "docker:dev:console": "docker exec -it project-nitro-typescript_server-dev bash", - "docker:prod": "docker-compose up" + "start": "npm run dev" }, "keywords": [ "frontend", diff --git a/packages/project-nitro-typescript/project/docs/nitro-docker.md b/packages/project-nitro-typescript/project/docs/nitro-docker.md deleted file mode 100644 index 93de8cfd..00000000 --- a/packages/project-nitro-typescript/project/docs/nitro-docker.md +++ /dev/null @@ -1,35 +0,0 @@ -# Nitro usage with docker - -This feature is currently in experimental status. - -Of course docker must be installed. - -## Production mode - -To start in production mode (prototype server): - -``` -npm run docker:prod -``` - -## Development mode - -To start in development mode: - -``` -npm run docker:start -``` - -If you need a console to the docker image, run: - -``` -npm run docker:dev:console -``` - -## Update Docker Image - -If you make changes to package.json or the Dockerfile you should recreate the docker image. - -``` -npm run docker:update -``` diff --git a/packages/project-nitro-typescript/project/docs/nitro.md b/packages/project-nitro-typescript/project/docs/nitro.md index aad50f01..c6333950 100644 --- a/packages/project-nitro-typescript/project/docs/nitro.md +++ b/packages/project-nitro-typescript/project/docs/nitro.md @@ -72,10 +72,6 @@ set PORT=8000 && set PROXY=8001 && npm start set PORT=3001 && npm run prod ``` -### Usage with docker - -For information on how to use Nitro with docker, please refer to [nitro-docker.md](./nitro-docker.md). - ## Configuring ### Config Package diff --git a/packages/project-nitro-typescript/readme.md b/packages/project-nitro-typescript/readme.md index 2d1a059b..ecaf7e17 100644 --- a/packages/project-nitro-typescript/readme.md +++ b/packages/project-nitro-typescript/readme.md @@ -25,10 +25,6 @@ and start in development mode npm start ``` -### Usage with docker (experimental) - -For information on how to use Nitro with docker, please refer to [nitro-docker.md](./project/docs/nitro-docker.md). - ## Nitro For information on how to use Nitro, please refer to [nitro.md](./project/docs/nitro.md). diff --git a/packages/project-nitro/.dockerignore b/packages/project-nitro/.dockerignore deleted file mode 100644 index 3cee00bc..00000000 --- a/packages/project-nitro/.dockerignore +++ /dev/null @@ -1,10 +0,0 @@ -.git -.idea -.vscode -dist -node_modules -project/docs -project/tmp -public/assets -public/reports -npm-debug.log diff --git a/packages/project-nitro/Dockerfile b/packages/project-nitro/Dockerfile deleted file mode 100644 index 31069e62..00000000 --- a/packages/project-nitro/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM node:10 - -# Backstopjs - https://hub.docker.com/r/backstopjs/backstopjs/dockerfile -ENV \ -PHANTOMJS_VERSION=2.1.16 \ -CASPERJS_VERSION=1.1.4 \ -SLIMERJS_VERSION=1.0.0 \ -BACKSTOPJS_VERSION=3.8.5 \ -# Workaround to fix phantomjs-prebuilt installation errors -# See https://github.com/Medium/phantomjs/issues/707 -NPM_CONFIG_UNSAFE_PERM=true - -# Base packages -RUN apt-get update && \ -apt-get install -y git sudo software-properties-common - -RUN sudo npm install -g --unsafe-perm=true --allow-root phantomjs-prebuilt@${PHANTOMJS_VERSION} -RUN sudo npm install -g --unsafe-perm=true --allow-root casperjs@${CASPERJS_VERSION} -RUN sudo npm install -g --unsafe-perm=true --allow-root slimerjs@${SLIMERJS_VERSION} -RUN sudo npm install -g --unsafe-perm=true --allow-root backstopjs@${BACKSTOPJS_VERSION} - -RUN wget https://dl-ssl.google.com/linux/linux_signing_key.pub && sudo apt-key add linux_signing_key.pub -RUN sudo add-apt-repository "deb http://dl.google.com/linux/chrome/deb/ stable main" - -RUN apt-get -y update && \ -apt-get -y install google-chrome-stable - -RUN apt-get install -y firefox-esr - -# Create app directory -WORKDIR /app - -# Install app dependencies -# A wildcard is used to ensure both package.json AND package-lock.json are copied -COPY package*.json ./ -COPY .npmrc ./ -RUN npm install --ignore-optional - -# Bundle app source -COPY . . - -# Expose and start server -EXPOSE 8080 8081 3001 -CMD [ "npm", "start" ] diff --git a/packages/project-nitro/docker-compose-dev.yml b/packages/project-nitro/docker-compose-dev.yml deleted file mode 100644 index 5c80d980..00000000 --- a/packages/project-nitro/docker-compose-dev.yml +++ /dev/null @@ -1,13 +0,0 @@ -# docker-compose.yaml -version: "3" -services: - server: - build: . - container_name: project-nitro_server-dev - command: npm start - ports: - - 8081:8081 - - 3001:3001 - volumes: - - .:/app:rw - - /app/node_modules diff --git a/packages/project-nitro/docker-compose.yml b/packages/project-nitro/docker-compose.yml deleted file mode 100644 index 04fb3f24..00000000 --- a/packages/project-nitro/docker-compose.yml +++ /dev/null @@ -1,9 +0,0 @@ -# docker-compose.yaml for production (prototype) -version: "3" -services: - server: - build: . - container_name: project-nitro_server - command: npm run prod - ports: - - 8080:8080 diff --git a/packages/project-nitro/package.json b/packages/project-nitro/package.json index d82587b4..21dcef70 100644 --- a/packages/project-nitro/package.json +++ b/packages/project-nitro/package.json @@ -65,13 +65,7 @@ "prod:serve": "cross-env NODE_ENV=production nitro-app-serve", "start": "npm run start:light", "start:light": "cross-env THEME=light PORT=8081 PROXY=8082 npm run dev", - "start:dark": "cross-env THEME=dark PORT=8083 PROXY=8084 npm run dev", - "\n# DOCKER ------- ": "", - "docker:update": "docker-compose build", - "docker:start": "npm run docker:dev:start", - "docker:dev:start": "docker-compose -f docker-compose-dev.yml up", - "docker:dev:console": "docker exec -it project-nitro_server-dev bash", - "docker:prod": "docker-compose up" + "start:dark": "cross-env THEME=dark PORT=8083 PROXY=8084 npm run dev" }, "keywords": [ "frontend", diff --git a/packages/project-nitro/project/docs/nitro-docker.md b/packages/project-nitro/project/docs/nitro-docker.md deleted file mode 100644 index 93de8cfd..00000000 --- a/packages/project-nitro/project/docs/nitro-docker.md +++ /dev/null @@ -1,35 +0,0 @@ -# Nitro usage with docker - -This feature is currently in experimental status. - -Of course docker must be installed. - -## Production mode - -To start in production mode (prototype server): - -``` -npm run docker:prod -``` - -## Development mode - -To start in development mode: - -``` -npm run docker:start -``` - -If you need a console to the docker image, run: - -``` -npm run docker:dev:console -``` - -## Update Docker Image - -If you make changes to package.json or the Dockerfile you should recreate the docker image. - -``` -npm run docker:update -``` diff --git a/packages/project-nitro/project/docs/nitro.md b/packages/project-nitro/project/docs/nitro.md index 3a6be650..33f18e81 100644 --- a/packages/project-nitro/project/docs/nitro.md +++ b/packages/project-nitro/project/docs/nitro.md @@ -72,10 +72,6 @@ set PORT=8000 && set PROXY=8001 && npm start set PORT=3001 && npm run prod ``` -### Usage with docker - -For information on how to use Nitro with docker, please refer to [nitro-docker.md](./nitro-docker.md). - ## Configuring ### Config Package diff --git a/packages/project-nitro/readme.md b/packages/project-nitro/readme.md index 2d1a059b..ecaf7e17 100644 --- a/packages/project-nitro/readme.md +++ b/packages/project-nitro/readme.md @@ -25,10 +25,6 @@ and start in development mode npm start ``` -### Usage with docker (experimental) - -For information on how to use Nitro with docker, please refer to [nitro-docker.md](./project/docs/nitro-docker.md). - ## Nitro For information on how to use Nitro, please refer to [nitro.md](./project/docs/nitro.md).