From 323e3174ec13fc26c69c5714d129685bfacaed93 Mon Sep 17 00:00:00 2001 From: fabriciojs Date: Tue, 24 Oct 2023 00:24:52 -0300 Subject: [PATCH 1/2] update node:16 to node:20 --- docs/1-Getting-Started/3-How-it-works.md | 4 ++-- docs/1-Getting-Started/4-Starting-new-project.md | 4 ++-- docs/2-Presets/AdonisJs.md | 2 +- docs/2-Presets/ExpressJS.md | 2 +- docs/2-Presets/Laravel.md | 4 ++-- docs/2-Presets/NestJS.md | 2 +- docs/2-Presets/NextJS.md | 4 ++-- docs/2-Presets/NuxtJS.md | 4 ++-- docs/6-Troubleshooting/hmr-eer-empty-response.md | 4 ++-- presets/expressjs/docker-compose.yml | 2 +- presets/nest+next/config.yml | 8 ++++---- presets/nest+next/nest+next-docker-compose.yml | 4 ++-- presets/nest+next/nest+next-kool.yml | 4 ++-- presets/nestjs/config.yml | 4 ++-- presets/nestjs/docker-compose.nestjs.yml | 2 +- presets/nestjs/kool.nestjs.yml | 2 +- presets/nextjs/config.yml | 4 ++-- presets/nextjs/docker-compose.yml | 2 +- presets/nodejs/docker-compose.yml | 2 +- presets/nuxtjs/config.yml | 4 ++-- presets/nuxtjs/docker-compose.yml | 2 +- templates/misc/npm-vitejs.yml | 2 +- templates/misc/yarn-vitejs.yml | 2 +- templates/scripts/npm-expressjs.yml | 2 +- templates/scripts/npm-laravel.yml | 4 ++-- templates/scripts/npm-nextjs.yml | 2 +- templates/scripts/npm-nuxtjs.yml | 2 +- templates/scripts/npm.yml | 4 ++-- templates/scripts/yarn-expressjs.yml | 2 +- templates/scripts/yarn-laravel.yml | 2 +- templates/scripts/yarn-nextjs.yml | 2 +- templates/scripts/yarn-nuxtjs.yml | 2 +- templates/scripts/yarn.yml | 2 +- 33 files changed, 49 insertions(+), 49 deletions(-) diff --git a/docs/1-Getting-Started/3-How-it-works.md b/docs/1-Getting-Started/3-How-it-works.md index eb53dd7c..e1b4b1b8 100644 --- a/docs/1-Getting-Started/3-How-it-works.md +++ b/docs/1-Getting-Started/3-How-it-works.md @@ -68,8 +68,8 @@ scripts: artisan: kool exec app php artisan composer: kool exec app composer mysql: kool exec -e MYSQL_PWD=$DB_PASSWORD database mysql -uroot - node: kool docker kooldev/node:16 node - npm: kool docker kooldev/node:16 npm # or yarn + node: kool docker kooldev/node:20 node + npm: kool docker kooldev/node:20 npm # or yarn npx: kool exec app npx setup: diff --git a/docs/1-Getting-Started/4-Starting-new-project.md b/docs/1-Getting-Started/4-Starting-new-project.md index 8a062b86..1833cf0a 100644 --- a/docs/1-Getting-Started/4-Starting-new-project.md +++ b/docs/1-Getting-Started/4-Starting-new-project.md @@ -157,8 +157,8 @@ Here's a **kool.yml** example to show you the types of commands you can add and ```yaml scripts: composer: kool exec app composer2 - node: kool docker kooldev/node:16 node - yarn: kool docker kooldev/node:16 yarn + node: kool docker kooldev/node:20 node + yarn: kool docker kooldev/node:20 yarn setup: - kool docker kooldev/bash -c "cp .env.example .env" diff --git a/docs/2-Presets/AdonisJs.md b/docs/2-Presets/AdonisJs.md index ff2fc405..e0fe7a48 100644 --- a/docs/2-Presets/AdonisJs.md +++ b/docs/2-Presets/AdonisJs.md @@ -147,7 +147,7 @@ scripts: npx: kool exec app npx setup: - - kool docker kooldev/node:16 npm install # or yarn install + - kool docker kooldev/node:20 npm install # or yarn install - kool start ``` diff --git a/docs/2-Presets/ExpressJS.md b/docs/2-Presets/ExpressJS.md index ef02608b..3b5fe6ab 100644 --- a/docs/2-Presets/ExpressJS.md +++ b/docs/2-Presets/ExpressJS.md @@ -69,7 +69,7 @@ scripts: npx: kool exec app npx setup: - - kool docker kooldev/node:16 npm install + - kool docker kooldev/node:20 npm install - kool start # - add more setup commands ``` diff --git a/docs/2-Presets/Laravel.md b/docs/2-Presets/Laravel.md index cd5aaba9..f2d5c66b 100644 --- a/docs/2-Presets/Laravel.md +++ b/docs/2-Presets/Laravel.md @@ -136,8 +136,8 @@ scripts: artisan: kool exec app php artisan composer: kool exec app composer mysql: kool exec -e MYSQL_PWD=$DB_PASSWORD database mysql -uroot - node: kool docker kooldev/node:16 node - npm: kool docker kooldev/node:16 npm # or yarn + node: kool docker kooldev/node:20 node + npm: kool docker kooldev/node:20 npm # or yarn npx: kool exec app npx setup: diff --git a/docs/2-Presets/NestJS.md b/docs/2-Presets/NestJS.md index 2770a2eb..fcd719be 100644 --- a/docs/2-Presets/NestJS.md +++ b/docs/2-Presets/NestJS.md @@ -76,7 +76,7 @@ scripts: # copy .env file - cp .env.dist .env # install backend deps - - kool docker kooldev/node:16 npm install + - kool docker kooldev/node:20 npm install # helpers npm: kool exec app npm diff --git a/docs/2-Presets/NextJS.md b/docs/2-Presets/NextJS.md index ddd7134c..08dbc90c 100644 --- a/docs/2-Presets/NextJS.md +++ b/docs/2-Presets/NextJS.md @@ -25,7 +25,7 @@ Use the [`kool create PRESET FOLDER` command](/docs/commands/kool-create) to cre $ kool create nextjs my-project ``` -Under the hood, this command will run `yarn create next-app my-project` to install Next.js using a customized **kool** Docker image: kooldev/node:16. +Under the hood, this command will run `yarn create next-app my-project` to install Next.js using a customized **kool** Docker image: kooldev/node:20. After installing Next.js, `kool create` automatically runs the `kool preset nextjs` command, which helps you easily set up the initial tech stack for your project using an interactive wizard. @@ -68,7 +68,7 @@ scripts: npx: kool exec app npx setup: - - kool docker kooldev/node:16 npm install # or yarn install + - kool docker kooldev/node:20 npm install # or yarn install - kool start ``` diff --git a/docs/2-Presets/NuxtJS.md b/docs/2-Presets/NuxtJS.md index 2978ff68..38829aa9 100644 --- a/docs/2-Presets/NuxtJS.md +++ b/docs/2-Presets/NuxtJS.md @@ -26,7 +26,7 @@ Use the [`kool create PRESET FOLDER` command](/docs/commands/kool-create) to cre $ kool create nuxtjs my-project ``` -Under the hood, this command will run `yarn create nuxt-app my-project` to install NuxtJS using a customized **kool** Docker image: kooldev/node:16. +Under the hood, this command will run `yarn create nuxt-app my-project` to install NuxtJS using a customized **kool** Docker image: kooldev/node:20. After installing NuxtJS, `kool create` automatically runs the `kool preset nuxtjs` command, which helps you easily set up the initial tech stack for your project using an interactive wizard. @@ -87,7 +87,7 @@ scripts: npx: kool exec app npx setup: - - kool docker kooldev/node:16 npm install # or yarn install + - kool docker kooldev/node:20 npm install # or yarn install - kool start ``` diff --git a/docs/6-Troubleshooting/hmr-eer-empty-response.md b/docs/6-Troubleshooting/hmr-eer-empty-response.md index 5aa5618a..a5216f4d 100644 --- a/docs/6-Troubleshooting/hmr-eer-empty-response.md +++ b/docs/6-Troubleshooting/hmr-eer-empty-response.md @@ -17,8 +17,8 @@ For the sake of clarity, let's elect port `8080` to publish. In your `kool.yml`, apply the following changes: ```diff --npm: kool docker kooldev/node:16 npm -+npm: kool docker -p 8080:8080 kooldev/node:16 npm +-npm: kool docker kooldev/node:20 npm ++npm: kool docker -p 8080:8080 kooldev/node:20 npm ``` - Alternatively, if you don't want to publish the port for your general `kool run npm` commands, you may add a new entry. diff --git a/presets/expressjs/docker-compose.yml b/presets/expressjs/docker-compose.yml index 27452e82..4a5fbd85 100644 --- a/presets/expressjs/docker-compose.yml +++ b/presets/expressjs/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.7" services: app: - image: kooldev/node:16 + image: kooldev/node:20 command: ["node", "app.js"] ports: - "${KOOL_APP_PORT:-3000}:3000" diff --git a/presets/nest+next/config.yml b/presets/nest+next/config.yml index 14d10efa..599323b9 100644 --- a/presets/nest+next/config.yml +++ b/presets/nest+next/config.yml @@ -7,10 +7,10 @@ create: - name: Creating new NestJS Application actions: - scripts: - - docker pull -q kooldev/node:16 + - docker pull -q kooldev/node:20 - mkdir $CREATE_DIRECTORY - - kool docker kooldev/node:16 npx -y @nestjs/cli new -l Typescript -p npm --skip-git $CREATE_DIRECTORY/backend - - kool docker kooldev/node:16 npx -y create-next-app@latest --ts --use-npm $CREATE_DIRECTORY/frontend + - kool docker kooldev/node:20 npx -y @nestjs/cli new -l Typescript -p npm --skip-git $CREATE_DIRECTORY/backend + - kool docker kooldev/node:20 npx -y create-next-app@latest --ts --use-npm $CREATE_DIRECTORY/frontend preset: - name: 'Copy basic config files' @@ -28,4 +28,4 @@ preset: - copy: gitignore dst: .gitignore - scripts: - - kool docker kooldev/node:16 sed -i 's/app.listen(3000)/app.listen(process.env.KOOL_BACKEND_PORT)/' backend/src/main.ts + - kool docker kooldev/node:20 sed -i 's/app.listen(3000)/app.listen(process.env.KOOL_BACKEND_PORT)/' backend/src/main.ts diff --git a/presets/nest+next/nest+next-docker-compose.yml b/presets/nest+next/nest+next-docker-compose.yml index 3f2f3707..56ea7959 100644 --- a/presets/nest+next/nest+next-docker-compose.yml +++ b/presets/nest+next/nest+next-docker-compose.yml @@ -1,6 +1,6 @@ services: frontend: - image: kooldev/node:16 + image: kooldev/node:20 command: ["npm", "run", "dev", "--", "-p", "${KOOL_FRONTEND_PORT:-80}"] ports: - "${KOOL_FRONTEND_PORT:-80}:${KOOL_FRONTEND_PORT:-80}" @@ -15,7 +15,7 @@ services: - kool_local - kool_global backend: - image: kooldev/node:16 + image: kooldev/node:20 command: ["npm", "run", "start:dev"] ports: - "${KOOL_BACKEND_PORT:-81}:${KOOL_BACKEND_PORT:-81}" diff --git a/presets/nest+next/nest+next-kool.yml b/presets/nest+next/nest+next-kool.yml index d992c501..727d065f 100644 --- a/presets/nest+next/nest+next-kool.yml +++ b/presets/nest+next/nest+next-kool.yml @@ -4,9 +4,9 @@ scripts: - cp .env.dist backend/.env - ln -s backend/.env .env # install backend deps - - kool docker kooldev/node:16 npm --prefix ./backend install + - kool docker kooldev/node:20 npm --prefix ./backend install # install frontend deps - - kool docker kooldev/node:16 npm --prefix ./frontend install + - kool docker kooldev/node:20 npm --prefix ./frontend install # backend helpers backend:npm: kool exec backend npm diff --git a/presets/nestjs/config.yml b/presets/nestjs/config.yml index 6073370f..5e6eea87 100644 --- a/presets/nestjs/config.yml +++ b/presets/nestjs/config.yml @@ -6,8 +6,8 @@ create: - name: Creating new NestJS Application actions: - scripts: - - docker pull -q kooldev/node:16 - - kool docker kooldev/node:16 npx -y @nestjs/cli new -l Typescript -p npm $CREATE_DIRECTORY + - docker pull -q kooldev/node:20 + - kool docker kooldev/node:20 npx -y @nestjs/cli new -l Typescript -p npm $CREATE_DIRECTORY # Preset defines the workflow for installing this preset in the current working directory preset: diff --git a/presets/nestjs/docker-compose.nestjs.yml b/presets/nestjs/docker-compose.nestjs.yml index c7feaf19..a97c5ebf 100644 --- a/presets/nestjs/docker-compose.nestjs.yml +++ b/presets/nestjs/docker-compose.nestjs.yml @@ -1,6 +1,6 @@ services: app: - image: kooldev/node:16 + image: kooldev/node:20 command: ["npm", "run", "start:dev"] ports: - "${KOOL_APP_PORT:-3000}:${KOOL_APP_PORT:-3000}" diff --git a/presets/nestjs/kool.nestjs.yml b/presets/nestjs/kool.nestjs.yml index 2ad87d37..e04cac3c 100644 --- a/presets/nestjs/kool.nestjs.yml +++ b/presets/nestjs/kool.nestjs.yml @@ -3,7 +3,7 @@ scripts: # copy .env file - cp .env.dist .env # install backend deps - - kool docker kooldev/node:16 npm install + - kool docker kooldev/node:20 npm install # helpers npm: kool exec app npm diff --git a/presets/nextjs/config.yml b/presets/nextjs/config.yml index 0efcbb99..1211d03f 100644 --- a/presets/nextjs/config.yml +++ b/presets/nextjs/config.yml @@ -6,8 +6,8 @@ create: - name: Creating new NextJS Application actions: - scripts: - - docker pull -q kooldev/node:16 - - kool docker kooldev/node:16 yarn create next-app $CREATE_DIRECTORY + - docker pull -q kooldev/node:20 + - kool docker kooldev/node:20 yarn create next-app $CREATE_DIRECTORY # Preset defines the workflow for installing this preset in the current working directory preset: diff --git a/presets/nextjs/docker-compose.yml b/presets/nextjs/docker-compose.yml index 98e9b635..ac9f2968 100644 --- a/presets/nextjs/docker-compose.yml +++ b/presets/nextjs/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.7" services: app: - image: kooldev/node:16 + image: kooldev/node:20 command: ["npm", "run", "dev"] ports: - "${KOOL_APP_PORT:-3000}:3000" diff --git a/presets/nodejs/docker-compose.yml b/presets/nodejs/docker-compose.yml index 27452e82..4a5fbd85 100644 --- a/presets/nodejs/docker-compose.yml +++ b/presets/nodejs/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.7" services: app: - image: kooldev/node:16 + image: kooldev/node:20 command: ["node", "app.js"] ports: - "${KOOL_APP_PORT:-3000}:3000" diff --git a/presets/nuxtjs/config.yml b/presets/nuxtjs/config.yml index 2f7e31a9..2498ebab 100644 --- a/presets/nuxtjs/config.yml +++ b/presets/nuxtjs/config.yml @@ -6,8 +6,8 @@ create: - name: Creating new Nuxt Application actions: - scripts: - - docker pull -q kooldev/node:16 - - kool docker kooldev/node:16 yarn create nuxt-app $CREATE_DIRECTORY + - docker pull -q kooldev/node:20 + - kool docker kooldev/node:20 yarn create nuxt-app $CREATE_DIRECTORY # Preset defines the workflow for installing this preset in the current working directory preset: diff --git a/presets/nuxtjs/docker-compose.yml b/presets/nuxtjs/docker-compose.yml index 02c3494e..3404331f 100644 --- a/presets/nuxtjs/docker-compose.yml +++ b/presets/nuxtjs/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.7" services: app: - image: kooldev/node:16 + image: kooldev/node:20 command: ["npm", "run", "dev"] ports: - "${KOOL_APP_PORT:-3000}:3000" diff --git a/templates/misc/npm-vitejs.yml b/templates/misc/npm-vitejs.yml index 9c266d95..f777c5b1 100644 --- a/templates/misc/npm-vitejs.yml +++ b/templates/misc/npm-vitejs.yml @@ -1,6 +1,6 @@ services: node: - image: kooldev/node:16 + image: kooldev/node:20 command: ["npm", "run", "dev"] ports: - "3001:3001" diff --git a/templates/misc/yarn-vitejs.yml b/templates/misc/yarn-vitejs.yml index 3990e7f1..efbbdead 100644 --- a/templates/misc/yarn-vitejs.yml +++ b/templates/misc/yarn-vitejs.yml @@ -1,6 +1,6 @@ services: node: - image: kooldev/node:16 + image: kooldev/node:20 command: ["yarn", "dev"] ports: - "3001:3001" diff --git a/templates/scripts/npm-expressjs.yml b/templates/scripts/npm-expressjs.yml index d8d6f225..7f894915 100644 --- a/templates/scripts/npm-expressjs.yml +++ b/templates/scripts/npm-expressjs.yml @@ -4,5 +4,5 @@ scripts: npx: kool exec app npx setup: - - kool docker kooldev/node:16 npm install + - kool docker kooldev/node:20 npm install - kool start diff --git a/templates/scripts/npm-laravel.yml b/templates/scripts/npm-laravel.yml index d0e715fd..73a2fe49 100644 --- a/templates/scripts/npm-laravel.yml +++ b/templates/scripts/npm-laravel.yml @@ -1,7 +1,7 @@ scripts: # npm - helpers for JS handling - npm: kool docker kooldev/node:16 npm - npx: kool docker kooldev/node:16 npx + npm: kool docker kooldev/node:20 npm + npx: kool docker kooldev/node:20 npx before-start: - kool run npm install reset: diff --git a/templates/scripts/npm-nextjs.yml b/templates/scripts/npm-nextjs.yml index 53e71603..58751b56 100644 --- a/templates/scripts/npm-nextjs.yml +++ b/templates/scripts/npm-nextjs.yml @@ -3,5 +3,5 @@ scripts: npx: kool exec app npx setup: - - kool docker kooldev/node:16 npm install + - kool docker kooldev/node:20 npm install - kool start diff --git a/templates/scripts/npm-nuxtjs.yml b/templates/scripts/npm-nuxtjs.yml index 53e71603..58751b56 100644 --- a/templates/scripts/npm-nuxtjs.yml +++ b/templates/scripts/npm-nuxtjs.yml @@ -3,5 +3,5 @@ scripts: npx: kool exec app npx setup: - - kool docker kooldev/node:16 npm install + - kool docker kooldev/node:20 npm install - kool start diff --git a/templates/scripts/npm.yml b/templates/scripts/npm.yml index 2358d315..a43747fb 100644 --- a/templates/scripts/npm.yml +++ b/templates/scripts/npm.yml @@ -1,7 +1,7 @@ scripts: # npm - helpers for JS handling - npm: kool docker kooldev/node:16 npm - npx: kool docker kooldev/node:16 npx + npm: kool docker kooldev/node:20 npm + npx: kool docker kooldev/node:20 npx setup: - kool run npm install reset: diff --git a/templates/scripts/yarn-expressjs.yml b/templates/scripts/yarn-expressjs.yml index 45f68d96..e8e3bb44 100644 --- a/templates/scripts/yarn-expressjs.yml +++ b/templates/scripts/yarn-expressjs.yml @@ -3,5 +3,5 @@ scripts: yarn: kool exec app yarn setup: - - kool docker kooldev/node:16 yarn install + - kool docker kooldev/node:20 yarn install - kool start diff --git a/templates/scripts/yarn-laravel.yml b/templates/scripts/yarn-laravel.yml index 8df31ba0..fa3be82e 100644 --- a/templates/scripts/yarn-laravel.yml +++ b/templates/scripts/yarn-laravel.yml @@ -1,6 +1,6 @@ scripts: # yarn - helpers for JS handling - yarn: kool docker kooldev/node:16 yarn + yarn: kool docker kooldev/node:20 yarn before-start: - kool run yarn install reset: diff --git a/templates/scripts/yarn-nextjs.yml b/templates/scripts/yarn-nextjs.yml index 58d12047..0cafa100 100644 --- a/templates/scripts/yarn-nextjs.yml +++ b/templates/scripts/yarn-nextjs.yml @@ -2,5 +2,5 @@ scripts: yarn: kool exec app yarn setup: - - kool docker kooldev/node:16 yarn install + - kool docker kooldev/node:20 yarn install - kool start diff --git a/templates/scripts/yarn-nuxtjs.yml b/templates/scripts/yarn-nuxtjs.yml index 58d12047..0cafa100 100644 --- a/templates/scripts/yarn-nuxtjs.yml +++ b/templates/scripts/yarn-nuxtjs.yml @@ -2,5 +2,5 @@ scripts: yarn: kool exec app yarn setup: - - kool docker kooldev/node:16 yarn install + - kool docker kooldev/node:20 yarn install - kool start diff --git a/templates/scripts/yarn.yml b/templates/scripts/yarn.yml index 7ccc150b..abcfe50a 100644 --- a/templates/scripts/yarn.yml +++ b/templates/scripts/yarn.yml @@ -1,6 +1,6 @@ scripts: # yarn - helpers for JS handling - yarn: kool docker kooldev/node:16 yarn + yarn: kool docker kooldev/node:20 yarn setup: - kool run yarn install reset: From 45b69954951bf8e504f502022ce3c306af761c15 Mon Sep 17 00:00:00 2001 From: fabriciojs Date: Tue, 24 Oct 2023 00:26:43 -0300 Subject: [PATCH 2/2] update Redis 6 to Redis 7 --- recipes/pick-cache.yml | 6 +++--- recipes/redis-6.yml | 5 ----- recipes/redis-7.yml | 5 +++++ templates/cache/{redis6.yml => redis7.yml} | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 recipes/redis-6.yml create mode 100644 recipes/redis-7.yml rename templates/cache/{redis6.yml => redis7.yml} (86%) diff --git a/recipes/pick-cache.yml b/recipes/pick-cache.yml index 7346ace8..ddf478fe 100644 --- a/recipes/pick-cache.yml +++ b/recipes/pick-cache.yml @@ -3,11 +3,11 @@ title: "Wizard: cache service" actions: # Defines which cache service to use (in-memory key/value storage) - prompt: 'Which cache service do you want to use' - default: 'Redis 6.0' + default: 'Redis 7.0' options: - - name: 'Redis 6.0' + - name: 'Redis 7.0' actions: - - recipe: redis-6 + - recipe: redis-7 - name: 'Memcached 1.6' actions: - recipe: memcached-1.6 diff --git a/recipes/redis-6.yml b/recipes/redis-6.yml deleted file mode 100644 index 9418b4c9..00000000 --- a/recipes/redis-6.yml +++ /dev/null @@ -1,5 +0,0 @@ -title: "Redis 6" - -actions: - - merge: cache/redis6.yml - dst: docker-compose.yml diff --git a/recipes/redis-7.yml b/recipes/redis-7.yml new file mode 100644 index 00000000..ad808e0e --- /dev/null +++ b/recipes/redis-7.yml @@ -0,0 +1,5 @@ +title: "Redis 7" + +actions: + - merge: cache/redis7.yml + dst: docker-compose.yml diff --git a/templates/cache/redis6.yml b/templates/cache/redis7.yml similarity index 86% rename from templates/cache/redis6.yml rename to templates/cache/redis7.yml index b9c2c603..c645faef 100644 --- a/templates/cache/redis6.yml +++ b/templates/cache/redis7.yml @@ -1,6 +1,6 @@ services: cache: - image: redis:6-alpine + image: redis:7-alpine volumes: - cache:/data:delegated networks: