diff --git a/README.md b/README.md
index 8501db3..47c8d94 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,10 @@ ce-dev 2.x
======
Local Stack wrapper tool
-[](https://github.com/codeenigma/ce-dev/actions/workflows/ce-dev-devel-linux.yml)
+[](https://github.com/codeenigma/ce-dev/actions/workflows/ubuntu-pr.yml)
+
+[](https://github.com/codeenigma/ce-dev/actions/workflows/devel-ubuntu-pr.yml)
+
[](https://sonarcloud.io/dashboard?id=codeenigma_ce-dev)
[](https://sonarcloud.io/dashboard?id=codeenigma_ce-dev)
[](https://sonarcloud.io/dashboard?id=codeenigma_ce-dev)
@@ -18,6 +21,7 @@ Local Stack wrapper tool
* Removed drupal 8 and drupal 9 templates.
* The way to assign IPs have changed.
* All the packages used are up to date.
+* Removed yarn as dependency.
## Key features
- Allows several projects (or the host) to re-use the same ports
@@ -48,8 +52,8 @@ Once you make your changes in the source dode ({root}/src folder), you need to c
execute the following commands:
```
-yarn clean
-yarn build
+npm run clean
+npm run build
```
This will clean and compile the new js files. A new folder {root}/lib is generated
@@ -77,9 +81,6 @@ it means you would need to have the local docker images with tag 2.x
dioni@dionice:~/projects/wrap$ docker image ls
[sudo] contraseña para dioni:
REPOSITORY TAG IMAGE ID CREATED SIZE
-codeenigma/drupal10-db 2.x 5cae51ec65c0 3 days ago 409MB
-codeenigma/drupal10-web 2.x 83cc832fb73d 3 days ago 1.47GB
-codeenigma/blank-blank 2.x 5157934972ad 3 days ago 1.26GB
codeenigma/ce-dev 2.x 8753195771fc 3 days ago 691MB
codeenigma/ce-dev-controller 2.x 5aed115a5e74 3 days ago 1.83GB
```
@@ -95,14 +96,8 @@ If you don't have the local images, you can follow these steps:
```angular2html
/bin/sh docker-images/export.sh --version 2.x --image-name ce-dev --dockerfile-path base
/bin/sh docker-images/export.sh --version 2.x --image-name ce-dev-controller --dockerfile-path controller
-/bin/sh templates/test.sh --template ce-dev.compose.yml
```
-The last step will generate the drupal10-web, drupal10-db and blank docker images. Also, it will create docker containers
-with the same name. You can remove these containers because we only need the images.
-
-Now we can start to test our ce-dev changes as it is described in the previous point 'How to compile'
-
### Testing a new ce-dev release locally.
@@ -110,7 +105,7 @@ If you need to test the creation of releases locally, we can do it using oclif.
oclif is an open source framework for building a command line interface (CLI) in Node.js and Typescript https://oclif.io/
-As part of the command we used ```yarn build```, a folder /lib was generated. This folder contains the javascript code
+As part of the command we used ```npm run build```, a folder /lib was generated. This folder contains the javascript code
used by oclif.
According to your system, your local ce-dev version will be different. Here the list of available targets:
@@ -127,7 +122,15 @@ Probably you will use linux-...64 or darwin-...64 version.
Use oclif pack to generate a new release for your system:
-i.e: yarn oclif pack tarballs --targets=linux-x64 --no-xz
+i.e:
+
+
+npm run prepack-oclif
+
+npx oclif pack tarballs --targets=linux-x64 --no-xz
+
+npm run postpack-oclif
+
This will generate a tar.gz file inside a new directory named /dir/ce-dev-xxxxxx
You can un-compress and put it where you want. i.e: you can put it in /opt too (where you have the current ce-dev)
diff --git a/src/commands/build.ts b/src/commands/build.ts
index 1ad621b..158ffb3 100644
--- a/src/commands/build.ts
+++ b/src/commands/build.ts
@@ -79,9 +79,10 @@ export default class BuildCmd extends BaseCmd {
if (this.composeConfig['x-ce_dev']) {
containerName = this.composeConfig['x-ce_dev'].project_name + '-' + name
}
+
let version = AppSettings.ceDevVersion + '.x'
if (this.developmentMode) {
- version += '-devel'
+ version = 'devel-' + version
}
ux.action.start('Committing container ' + containerName + ' as a new image.')
@@ -98,8 +99,9 @@ export default class BuildCmd extends BaseCmd {
private generateCompose(): void {
let version = AppSettings.ceDevVersion + '.x'
if (this.developmentMode) {
- version += '-devel'
+ version = 'devel-' + version
}
+
ux.action.start('Generating new compose file ' + this.composeDest + '.')
for (const [name, service] of Object.entries(this.composeConfig.services)) {
const containerName = this.composeConfig['x-ce_dev'].project_name + '-' + name
diff --git a/src/commands/push.ts b/src/commands/push.ts
index 034419e..12fc131 100644
--- a/src/commands/push.ts
+++ b/src/commands/push.ts
@@ -50,8 +50,9 @@ export default class PushCmd extends DockerImagesCmd {
private push(): void {
let version = AppSettings.ceDevVersion + '.x'
if (this.developmentMode) {
- version += '-devel'
+ version = 'devel-' + version
}
+
for (const name of Object.keys(this.composeConfig.services)) {
const containerName = this.composeConfig['x-ce_dev'].project_name + '-' + name
ux.action.start('Pushing image ' + containerName)
diff --git a/src/controller-manager.ts b/src/controller-manager.ts
index 2fd6c13..7e9a069 100644
--- a/src/controller-manager.ts
+++ b/src/controller-manager.ts
@@ -250,8 +250,9 @@ export default class ControllerManager {
// If in development mode, we use devel version.
let version = AppSettings.ceDevVersion + '.x';
if (this.developmentMode) {
- version += '-devel';
+ version = 'devel-' + version
}
+
execSync(this.dockerBin + ' pull codeenigma/ce-dev-controller:' + version, {
stdio: 'inherit',
})
@@ -261,8 +262,9 @@ export default class ControllerManager {
const ipManager = new IPManager(this.config, this.dockerBin)
let version = AppSettings.ceDevVersion + '.x'
if (this.developmentMode) {
- version += '-devel'
+ version = 'devel-' + version
}
+
return {
networks: {
ce_dev: {