From bd259229491082c9a36066211464684d56cd6ba3 Mon Sep 17 00:00:00 2001
From: Sean Marquez <capsulecorplab@gmail.com>
Date: Tue, 11 Jul 2023 12:19:56 -0700
Subject: [PATCH 1/5] update base image to core-ubuntu-jammy:1.13.1

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e5b88e5..4f65202 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM kasmweb/core-ubuntu-jammy:1.13.0
+FROM kasmweb/core-ubuntu-jammy:1.13.1
 USER root
 
 ENV HOME /home/kasm-default-profile

From 1e81b25ea7b6c4550a13cabeabd96858799ce97b Mon Sep 17 00:00:00 2001
From: Sean Marquez <capsulecorplab@gmail.com>
Date: Mon, 2 Oct 2023 01:09:07 -0700
Subject: [PATCH 2/5] update git version to 2.42.0

---
 playbook.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbook.yaml b/playbook.yaml
index 7ce3558..f388548 100644
--- a/playbook.yaml
+++ b/playbook.yaml
@@ -542,7 +542,7 @@
   tags: install_utilities
 
   vars:
-    git_version: "2.41.0"
+    git_version: "2.42.0"
     git_version_to_install: "1:{{ git_version }}-0ppa1~ubuntu22.04.1"
     keychain_version: "2.8.5"
     keychain_version_to_install: "{{ keychain_version }}-2"

From b7459fbfa253487e753a060d368215ac49e6c44a Mon Sep 17 00:00:00 2001
From: Sean Marquez <capsulecorplab@gmail.com>
Date: Mon, 2 Oct 2023 12:15:56 -0700
Subject: [PATCH 3/5] update kicad version to 7.0.8

---
 playbook.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbook.yaml b/playbook.yaml
index f388548..2332ee9 100644
--- a/playbook.yaml
+++ b/playbook.yaml
@@ -692,7 +692,7 @@
     - install_oshw_tools
 
   vars:
-    kicad_version: "7.0.6"
+    kicad_version: "7.0.8"
     kicad_version_to_install: "{{ kicad_version }}~ubuntu22.04.1"
 
   tasks:

From 2e3ca65126d52261d810771390d6241e497bdf56 Mon Sep 17 00:00:00 2001
From: Sean Marquez <capsulecorplab@gmail.com>
Date: Tue, 17 Oct 2023 20:18:31 -0700
Subject: [PATCH 4/5] set playbook tag to install_oshw_tools

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4f65202..6d092d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN apt update && apt -y install software-properties-common && add-apt-repositor
 
 # run Ansible commands
 COPY ./requirements.yaml ./playbook.yaml ./
-RUN ansible-galaxy install -r requirements.yaml && ansible-playbook -i,localhost playbook.yaml --tags "all" && rm -f ./*.yaml
+RUN ansible-galaxy install -r requirements.yaml && ansible-playbook -i,localhost playbook.yaml --tags "install_oshw_tools" && rm -f ./*.yaml
 
 # Custom Desktop Background - replace bg_custom.png on disk with your own background image
 COPY ./bg_custom.png /usr/share/extra/backgrounds/bg_default.png

From 99d919e21718f9b88aa6be9ab5ac46cc83830bdc Mon Sep 17 00:00:00 2001
From: Sean Marquez <capsulecorplab@gmail.com>
Date: Tue, 17 Oct 2023 23:45:12 -0700
Subject: [PATCH 5/5] install kicad before freecad

---
 playbook.yaml | 62 +++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/playbook.yaml b/playbook.yaml
index 2332ee9..d59bbfd 100644
--- a/playbook.yaml
+++ b/playbook.yaml
@@ -596,6 +596,37 @@
       url: https://gist.githubusercontent.com/capsulecorplab/401ba2fe0857a328f2a626adbf078cc6/raw/b89a6234f0d620ff60bcfe37f95de197b8772377/.gitconfig
       dest: /home/kasm-default-profile/
 
+-
+  # install KiCad
+  hosts: localhost
+  connection: local
+  tags:
+    - install_kicad
+    - install_oshw_tools
+
+  vars:
+    kicad_version: "7.0.8"
+    kicad_version_to_install: "{{ kicad_version }}~ubuntu22.04.1"
+
+  tasks:
+  - name: Add PPA repository for KiCad 7.0
+    shell: add-apt-repository ppa:kicad/kicad-7.0-releases
+  - name: install KiCad {{ kicad_version }} with Apt
+    apt:
+      name: kicad={{ kicad_version_to_install }}
+      update_cache: yes
+      install_recommends: yes
+  - name: Get KiCad version
+    shell: kicad-cli version
+    register: installed_kicad_version
+  - name: Display KiCad versions
+    debug:
+      msg: "kicad = {{ installed_kicad_version.stdout }}"
+  - name: Test KiCad version
+    fail:
+      msg: "KiCad Version Error: Expected {{ kicad_version }} | Found {{ installed_kicad_version.stdout }}"
+    when: installed_kicad_version.stdout != kicad_version
+
 -
   # install FreeCAD
   hosts: localhost
@@ -683,37 +714,6 @@
         - linkml==1.4.1
         - jinja2-cli==0.8.2
 
--
-  # install KiCad
-  hosts: localhost
-  connection: local
-  tags:
-    - install_kicad
-    - install_oshw_tools
-
-  vars:
-    kicad_version: "7.0.8"
-    kicad_version_to_install: "{{ kicad_version }}~ubuntu22.04.1"
-
-  tasks:
-  - name: Add PPA repository for KiCad 7.0
-    shell: add-apt-repository ppa:kicad/kicad-7.0-releases
-  - name: install KiCad {{ kicad_version }} with Apt
-    apt:
-      name: kicad={{ kicad_version_to_install }}
-      update_cache: yes
-      install_recommends: yes
-  - name: Get KiCad version
-    shell: kicad-cli version
-    register: installed_kicad_version
-  - name: Display KiCad versions
-    debug:
-      msg: "kicad = {{ installed_kicad_version.stdout }}"
-  - name: Test KiCad version
-    fail:
-      msg: "KiCad Version Error: Expected {{ kicad_version }} | Found {{ installed_kicad_version.stdout }}"
-    when: installed_kicad_version.stdout != kicad_version
-
 #  roles:
 #    - role: geerlingguy.pip