Merge branch '2.x_wiki_update' into 2.x_wiki_update_MR_devel

Author: DionisioFG

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

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)

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: {