Merge pull request #10 from capsulecorplab/update-base-image-to-ubunt…

…u-jammy

Update base image to ubuntu jammy

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/j-simmons-phd/kasm-core-ubuntu-focal:develop
+FROM kasmweb/core-ubuntu-jammy:1.13.1
 USER root
 
 ENV HOME /home/kasm-default-profile

README.md

@@ -4,7 +4,7 @@
 
 ## Introduction
 
-This repo provides an Immutable-Infrastructure-as-Code (IIaC) workspace for the Mars Desert Research Station (MDRS) based on the [Ansible based template for KASM Ubuntu Focal Images](https://github.com/j-simmons-phd/kasm-core-focal-template) template provided by @j-simmons-phd.  The workspace is configured with the following software:
+This repo provides an Immutable-Infrastructure-as-Code (IIaC) workspace for the Mars Desert Research Station (MDRS), based on an Ansible template for [KASM Ubuntu Jammy](https://hub.docker.com/r/kasmweb/core-ubuntu-jammy) images.  The workspace is configured with the following software:
 
 - git cli
 - [Keychain](https://www.funtoo.org/Keychain)

playbook.yaml

@@ -59,7 +59,7 @@
   hosts: localhost
   connection: local
   tags:
-  - install_generator_plantuml
+  - install_plantuml
   - install_generator_asciidoctor
   - install_doctools
 
@@ -111,56 +111,30 @@
   tags: install_utilities
 
   vars:
-    git_version: "2.38.1"
-    git_version_to_install: "1:{{ git_version }}-0ppa1~ubuntu20.04.1"
+    git_version: "2.43.0"
+    git_version_to_install: "1:{{ git_version }}-0ppa1~ubuntu22.04.1"
     keychain_version: "2.8.5"
-    keychain_version_to_install: "{{ keychain_version }}-1"
+    keychain_version_to_install: "{{ keychain_version }}-2"
     keychain_version_expected: "{{ keychain_version }}.."
 
   tasks:
-  - name: Install dh-autoreconf
+  - name: Add git PPA
+    shell: add-apt-repository ppa:git-core/ppa
+  - name: Install git
     apt:
-      name: dh-autoreconf
-      update_cache: yes
-  - name: Install libcurl4-gnutls-dev
-    apt:
-      name: libcurl4-gnutls-dev
-      update_cache: yes
-  - name: Install libexpat1-dev
-    apt:
-      name: libexpat1-dev
-      update_cache: yes
-  - name: Install gettext
-    apt:
-      name: gettext
-      update_cache: yes
-  - name: Install libz-dev
-    apt:
-      name: libz-dev
-      update_cache: yes
-  - name: Install libssl-dev
-    apt:
-      name: libssl-dev
-      update_cache: yes
-  - name: Install install-info
+      name: "git={{ git_version_to_install }}"
+  - name: Install Git Bash Completion
     apt:
-      name: install-info
+      name: bash-completion
       update_cache: yes
-  - name: Extract git source files
-    unarchive:
-      src: /home/kasm-default-profile/install_files/git-2.38.1.tar.gz
-      dest: /home/kasm-default-profile/install_files/
-      remote_src: yes
-      creates: /home/kasm-default-profile/install_files/git-2.38.1/README.md
-  - name: Build git
-    shell:
-      cmd: make configure && ./configure --prefix=/usr && make > /tmp/git_build_output.txt 2>&1 && make install
-      chdir: /home/kasm-default-profile/install_files/git-2.38.1
-      executable: /bin/bash
   - name: Install Keychain
     apt:
       name: "keychain={{ keychain_version_to_install }}"
       update_cache: yes
+  - name: install ping
+    apt:
+      name: iputils-ping
+      update_cache: yes
   - name: Get git version
     shell: git version | sed 's/[[:alpha:]|(|[:space:]]//g'
     register: installed_git_version
@@ -180,6 +154,8 @@
     fail:
       msg: "Keychain Version Error: Expected {{ keychain_version_expected }} | Found {{ installed_keychain_version.stdout }}"
     when: installed_keychain_version.stdout != keychain_version_expected
+  - name: auto-launch keychain in shell, if ssh keys exists
+    shell: echo 'if [ -r ~/.ssh/id_ed25519 ]; then\n    eval `keychain --eval id_ed25519`\nfi' >> /home/kasm-default-profile/.bashrc
   - name: Install @capsulecorplab .vimrc
     get_url:
       url: https://gist.githubusercontent.com/capsulecorplab/495058e7a57ed8adaed3c40c80d09739/raw/4a6e6f6ff92b96919be111c9cbb5a4a21ab472d2/.vimrc
@@ -349,11 +325,11 @@
   connection: local
   gather_facts: yes
   tags:
-  - install_generator_plantuml
+  - install_plantuml
   - install_doctools
 
   vars:
-    jdk_version: 2:1.11-72
+    jdk_version: 2:1.11-72build2
     graphviz_version_expected: "dot - graphviz version 2.50.0 (20211204.2007)"
 
   tasks:
@@ -409,26 +385,5 @@
       state: absent
       remove: yes 
 
--
-  hosts: localhost
-  connection: local
-
-  tasks:
-  - name: Download source setup
-    get_url:
-      url: https://deb.nodesource.com/setup_17.x
-      dest: /root/nodesource_setup.sh
-      mode: 0700
-
-  - name: Set Node source in apt
-    shell:
-      cmd: /root/nodesource_setup.sh
-      executable: /bin/bash
-
-  - name: Apt install NodeJS
-    apt:
-      name: nodejs
-      update_cache: yes
-
 # Three dots indicate the end of a YAML document
 ...