From f8044f1c23b917ede076e510afda12fbfd3d332b Mon Sep 17 00:00:00 2001 From: fabriciojs Date: Sat, 21 Oct 2023 22:29:19 -0300 Subject: [PATCH] tweaking adonis settings - upgrading node, removing mysql 5.7 across the board --- presets/adonis/config.yml | 6 +++--- recipes/pick-db.yml | 3 --- templates/app/node-adonis.yml | 4 ++-- templates/scripts/npm-adonis.yml | 2 +- templates/scripts/yarn-adonis.yml | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/presets/adonis/config.yml b/presets/adonis/config.yml index 370a4e7a..bba85157 100644 --- a/presets/adonis/config.yml +++ b/presets/adonis/config.yml @@ -6,9 +6,9 @@ create: - name: Creating new Adonis Application actions: - scripts: - - docker pull -q kooldev/node:16 - - kool docker kooldev/node:16 npx -y @adonisjs/cli new $CREATE_DIRECTORY - - kool docker kooldev/node:16 npm --prefix=$CREATE_DIRECTORY i @adonisjs/cli + - docker pull -q kooldev/node:18 + - kool docker kooldev/node:18 npx -y @adonisjs/cli new $CREATE_DIRECTORY + - kool docker kooldev/node:18 npm --prefix=$CREATE_DIRECTORY i @adonisjs/cli # Preset defines the workflow for installing this preset in the current working directory preset: diff --git a/recipes/pick-db.yml b/recipes/pick-db.yml index 1c3b5c6a..9f8574f4 100644 --- a/recipes/pick-db.yml +++ b/recipes/pick-db.yml @@ -8,9 +8,6 @@ actions: - name: 'MySQL 8.0' actions: - recipe: mysql-8 - - name: 'MySQL 5.7' - actions: - - recipe: mysql-5.7 - name: 'MariaDB 10.5' actions: - recipe: maria-10.5 diff --git a/templates/app/node-adonis.yml b/templates/app/node-adonis.yml index a8f2b309..59a94457 100644 --- a/templates/app/node-adonis.yml +++ b/templates/app/node-adonis.yml @@ -1,7 +1,7 @@ services: app: - image: kooldev/node:16-adonis - command: ["adonis", "serve", "--dev"] + image: kooldev/node:18 + command: ["npx", "adonis", "serve", "--dev"] ports: - "${KOOL_APP_PORT:-3333}:3333" environment: diff --git a/templates/scripts/npm-adonis.yml b/templates/scripts/npm-adonis.yml index a6f79848..954b8f62 100644 --- a/templates/scripts/npm-adonis.yml +++ b/templates/scripts/npm-adonis.yml @@ -4,5 +4,5 @@ scripts: npx: kool exec app npx setup: - - kool docker kooldev/node:16 npm install + - kool docker kooldev/node:18 npm install - kool start diff --git a/templates/scripts/yarn-adonis.yml b/templates/scripts/yarn-adonis.yml index ce060039..d6ec7da2 100644 --- a/templates/scripts/yarn-adonis.yml +++ b/templates/scripts/yarn-adonis.yml @@ -3,5 +3,5 @@ scripts: yarn: kool exec app yarn setup: - - kool docker kooldev/node:16 yarn install + - kool docker kooldev/node:18 yarn install - kool start