2.x: Fixed version in controller-manager.ts

Author: DionisioFG

.github/workflows/README.md

@@ -8,13 +8,13 @@ Builds base and controller images using the contents of the `devel` branch on pu
 To test a `devel` container on a project, firstly fetch the container image:
 
 ```
-docker pull codeenigma/ce-dev-controller-2.x:devel
+docker pull codeenigma/ce-dev-controller:2.x
 ```
 
 Then edit your project's `ce-dev.compose.yml` file, changing the image for each applicable service to use the `devel` tag instead of the `latest` tag, for example:
 
 ```yaml
-    image: codeenigma/ce-dev-2.x:devel
+    image: codeenigma/ce-dev:2.x
 ```
 
 Finally, destroy and recreate your `docker compose` file and containers:
@@ -31,9 +31,9 @@ ce-dev deploy
 To test the `devel` version of the `ce-dev-controller` image locally you can do the following:
 
 ```bash
-docker pull codeenigma/ce-dev-controller-2.x:devel
+docker pull codeenigma/ce-dev-controller:2.x-devel
 # Replace the 'latest' tag with your 'devel' image
-docker tag codeenigma/ce-dev-controller-2.x:devel codeenigma/ce-dev-controller-2.x:latest
+docker tag codeenigma/ce-dev-controller:2.x-devel codeenigma/ce-dev-controller:2.x
 docker kill ce_dev_controller
 # Then in any ce-dev project
 ce-dev start

src/controller-manager.ts

@@ -248,20 +248,20 @@ export default class ControllerManager {
    */
   public pullImage(): void {
     // If in development mode, we use devel version.
-    let version = 'latest'
+    let version = AppSettings.ceDevVersion + '.x';
     if (this.developmentMode) {
-      version = 'devel'
+      version = '-devel';
     }
-    execSync(this.dockerBin + ' pull codeenigma/ce-dev-controller-' + AppSettings.ceDevVersion + '.x:' + version, {
+    execSync(this.dockerBin + ' pull codeenigma/ce-dev-controller:' + version, {
       stdio: 'inherit',
     })
   }
 
   private getControllerConfig(): DockerComposeConfigBare {
     const ipManager = new IPManager(this.config, this.dockerBin)
-    let version = 'latest'
+    let version = AppSettings.ceDevVersion + '.x'
     if (this.developmentMode) {
-      version = 'devel'
+      version = '-devel'
     }
     return {
       networks: {
@@ -275,7 +275,7 @@ export default class ControllerManager {
           cgroup: 'host',
           container_name: 'ce_dev_controller',
           hostname: 'ce_dev_controller',
-          image: 'codeenigma/ce-dev-controller-'+ AppSettings.ceDevVersion + '.x:' + version,
+          image: 'codeenigma/ce-dev-controller:' + version,
           networks: {
             ce_dev: {
               ipv4_address: ipManager.getControllerIP(),