From 323255286b7dea690bdf6ebb080f0fd85299ee2c Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Tue, 6 Aug 2024 20:25:51 +0200
Subject: [PATCH 1/3] Development on 2.2.50.dev1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3647f0f3..1a8db51c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gns3-web-ui",
-  "version": "2.2.49",
+  "version": "2.2.50.dev1",
   "author": {
     "name": "GNS3 Technology Inc.",
     "email": "developers@gns3.com"

From fc66124ea962006eb5ff9811590ee3feda79ba1c Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Wed, 18 Sep 2024 17:09:25 +0700
Subject: [PATCH 2/3] Add configure base mac address for Docker templates

---
 .../docker-template-details.component.html               | 9 +++++++++
 src/app/models/templates/docker-template.ts              | 1 +
 src/app/services/template-mocks.service.ts               | 1 +
 3 files changed, 11 insertions(+)

diff --git a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html
index e36dccf0..3f1b0e54 100644
--- a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html
+++ b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html
@@ -59,6 +59,15 @@ <h1 class="col">Docker image configuration</h1>
               placeholder="Start command"
             />
           </mat-form-field>
+          <mat-form-field class="form-field">
+            <input
+              matInput
+              type="text"
+              [ngModelOptions]="{ standalone: true }"
+              [(ngModel)]="dockerTemplate.mac_address"
+              placeholder="Base MAC"
+            />
+          </mat-form-field>
           <mat-form-field class="form-field">
             <input
               formControlName="adapter"
diff --git a/src/app/models/templates/docker-template.ts b/src/app/models/templates/docker-template.ts
index db700223..c009d8d5 100644
--- a/src/app/models/templates/docker-template.ts
+++ b/src/app/models/templates/docker-template.ts
@@ -10,6 +10,7 @@ export class DockerTemplate {
   console_http_port: number;
   console_resolution: string;
   console_type: string;
+  mac_address: string;
   custom_adapters: CustomAdapter[];
   default_name_format: string;
   environment: string;
diff --git a/src/app/services/template-mocks.service.ts b/src/app/services/template-mocks.service.ts
index 90a4b4f6..de9d72a8 100644
--- a/src/app/services/template-mocks.service.ts
+++ b/src/app/services/template-mocks.service.ts
@@ -256,6 +256,7 @@ export class TemplateMocksService {
       console_http_port: 80,
       console_resolution: '1024x768',
       console_type: 'telnet',
+      mac_address: '',
       custom_adapters: [],
       default_name_format: '{name}-{0}',
       environment: '',

From 28f8de0da1badf0c7b9bc61b13dd4d7f941c2d7f Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Mon, 21 Oct 2024 12:02:41 +1000
Subject: [PATCH 3/3] Release v2.2.50

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1a8db51c..aa65983c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gns3-web-ui",
-  "version": "2.2.50.dev1",
+  "version": "2.2.50",
   "author": {
     "name": "GNS3 Technology Inc.",
     "email": "developers@gns3.com"