yourtar-cli 1.0.5 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/bin/backTemplate/Makefile +1 -1
  2. package/bin/backTemplate/docker/docker-compose.dev.yml +7 -2
  3. package/bin/backTemplate/docker/docker-compose.prod.yml +7 -2
  4. package/bin/backTemplate/docker/docker-compose.stage.yml +6 -3
  5. package/bin/dockerfile/Dockerfile +2 -1
  6. package/bin/index.js +3 -1
  7. package/package.json +1 -1
package/bin/backTemplate/Makefile CHANGED
@@ -17,7 +17,7 @@ else
17
17
  cd docker && docker-compose -f docker-compose.${APP_MODE}.yml exec php_{{name}}_back composer dump-autoload --no-dev --classmap-authoritative
18
18
  endif
19
19
  cd docker && docker-compose -f docker-compose.${APP_MODE}.yml exec php_{{name}}_back bin/console doctrine:database:create --if-not-exists
20
- cd docker && docker-compose -f docker-compose.${APP_MODE}.yml exec php_{{name}}_back bin/console doctrine:migrations:migrate --no-interaction
20
+ cd docker && docker-compose -f docker-compose.${APP_MODE}.yml exec php_{{name}}_back bin/console doctrine:migrations:migrate --no-interaction --allow-no-migration
21
21
 
22
22
  down:
23
23
  cd docker && docker-compose -f docker-compose.${APP_MODE}.yml down
package/bin/backTemplate/docker/docker-compose.dev.yml CHANGED
@@ -11,8 +11,9 @@ services:
11
11
  volumes:
12
12
  - ../:/var/www/html/
13
13
  - ../vendor:/var/www/html/vendor
14
- links:
15
- - mysql_{{name}}_back
14
+ depends_on:
15
+ mysql_{{name}}_back:
16
+ condition: service_healthy
16
17
 
17
18
  nginx_{{name}}_back:
18
19
  container_name: nginx_{{name}}_back
@@ -37,6 +38,10 @@ services:
37
38
  - "3306"
38
39
  environment:
39
40
  MYSQL_ROOT_PASSWORD: ${DATABASE_PASSWORD}
41
+ healthcheck:
42
+ test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
43
+ timeout: 20s
44
+ retries: 10
40
45
  volumes:
41
46
  - ./db:/var/lib/mysql
42
47
 
package/bin/backTemplate/docker/docker-compose.prod.yml CHANGED
@@ -14,8 +14,9 @@ services:
14
14
  - ../:/var/www/html/
15
15
  - ../vendor:/var/www/html/vendor
16
16
  - ./config/php/php-ini-overrides.ini:/usr/local/etc/php/conf.d/php-ini-overrides.ini
17
- links:
18
- - mysql_{{name}}_back
17
+ depends_on:
18
+ mysql_{{name}}_back:
19
+ condition: service_healthy
19
20
 
20
21
  nginx_{{name}}_back:
21
22
  container_name: nginx_{{name}}_back
@@ -45,6 +46,10 @@ services:
45
46
  - "3306"
46
47
  environment:
47
48
  MYSQL_ROOT_PASSWORD: ${DATABASE_PASSWORD}
49
+ healthcheck:
50
+ test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
51
+ timeout: 20s
52
+ retries: 10
48
53
  volumes:
49
54
  - ./db:/var/lib/mysql
50
55
 
package/bin/backTemplate/docker/docker-compose.stage.yml CHANGED
@@ -14,9 +14,8 @@ services:
14
14
  - ../vendor:/var/www/html/vendor
15
15
  - ./config/php/php-ini-overrides.ini:/usr/local/etc/php/php.ini
16
16
  depends_on:
17
- - mysql_{{name}}_back
18
- links:
19
- - mysql_{{name}}_back
17
+ mysql_{{name}}_back:
18
+ condition: service_healthy
20
19
 
21
20
  nginx_{{name}}_back:
22
21
  container_name: nginx_{{name}}_back
@@ -44,6 +43,10 @@ services:
44
43
  - "3306"
45
44
  environment:
46
45
  - MYSQL_ROOT_PASSWORD=${DATABASE_PASSWORD}
46
+ healthcheck:
47
+ test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
48
+ timeout: 20s
49
+ retries: 10
47
50
  volumes:
48
51
  - ./db:/var/lib/mysql
49
52
 
package/bin/dockerfile/Dockerfile CHANGED
@@ -26,4 +26,5 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
26
26
 
27
27
  WORKDIR /var/www
28
28
 
29
- CMD composer create-project symfony/skeleton:"7.0.*" project
29
+ CMD composer create-project symfony/skeleton:"7.0.*" project
30
+
package/bin/index.js CHANGED
@@ -54,7 +54,7 @@ programm.command('create')
54
54
  default:
55
55
  console.error("ERROR!!! We don't know about this type: " + answers.platform);
56
56
  }
57
-
57
+
58
58
  await copyTemplate(templateFolder, './' + projectFolder, answers.name);
59
59
 
60
60
  switch(answers.platform) {
@@ -67,6 +67,8 @@ programm.command('create')
67
67
  await fs.copyFileSync('./' + projectFolder + '/.env', './' + projectFolder + '/docker/.env');
68
68
  await exec('docker-compose -f ./' + projectFolder + '/docker/docker-compose.dev.yml up -d --build');
69
69
  await exec('cd ' + projectFolder + '/docker && docker-compose -f docker-compose.dev.yml exec php_' + answers.name + '_back composer require serializer security cors orm');
70
+ if (fs.existsSync('./' + projectFolder + '/compose.yaml')) fs.unlinkSync('./' + projectFolder + '/compose.yaml');
71
+ if (fs.existsSync('./' + projectFolder + '/compose.override.yaml')) fs.unlinkSync('./' + projectFolder + '/compose.override.yaml');
70
72
  await exec('cd ' + projectFolder + '/docker && docker-compose -f docker-compose.dev.yml exec php_' + answers.name + '_back composer require --dev symfony/maker-bundle');
71
73
  await exec('docker-compose -f ./' + projectFolder + '/docker/docker-compose.dev.yml down');
72
74
  break;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "yourtar-cli",
3
- "version": "1.0.5",
3
+ "version": "1.1.1",
4
4
  "description": "This CLI for YourTar developers and our clients ;-)",
5
5
  "main": "bin/index.js",
6
6
  "scripts": {