Use podamn instead of docker. Closes #9

Author: evaschreck42

README.md

@@ -1,13 +1,12 @@
 # WSL2-setup 
-Get ready with Windows WSL2 for python development. The setup prepares you for local development with Docker and working in AWS.
+Get ready with Windows WSL2 for python development. The setup prepares you for local development with containers (podman) and working in AWS.
 We mainly work with JetBrains PyCharm Professional, but you can also use this setup if you want to work with VS Code
 
 The following setup is tested with
 - Windows 11 Pro ( Version 22H2 )
 - WSL2 feature enabled
-- VS Code 1.77
-- PyCharm Professional 2023.1
-- Docker Desktop 4.18.0
+- VS Code 1.80
+- PyCharm Professional 2023.2
 
 If you have other versions than the ones mentioned above, you might encounter different outcomes or run into issues. 
 In case of any questions or suggestions, please open up an issue here.
@@ -17,8 +16,7 @@ Task that we will accomplish during this setup
 - install software packages required for modern python development: [pyenv](https://github.com/pyenv/pyenv) 
   and [poetry](https://python-poetry.org/docs)
 - configure ssh agent to load your certificates automatically
-- ensure AWS client is configured and authentication with saml2aws works
-- set up a second WSL2 instance with the latest Ubuntu 23.04
+- ensure AWS client is installed
 - remove a WSL2 instance
 
 If not stated otherwise, all commands will run inside the WSL instance in Linux bash.
@@ -104,13 +102,6 @@ wsl -l -v
 wsl -d $WSL2_INSTANCE
 ```
 
-## Configure AWS CLI and saml2aws
-tbd. 
-
-In the meantime, please help yourself with 
-the [AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html) and 
-[saml2aws](https://github.com/Versent/saml2aws) documentation.  
-
 ## Global git config
 If you have set up a new WSL2 instance, you should create a global git config. The minimum you have to do is set your 
 username and email address. Please set the placeholders `<your-name>` and `<your-email-address>` in the script with your
@@ -156,47 +147,6 @@ It's required to keep your WSL instance up to date. form time to time you can ac
 ```shell
 sudo -- sh -c 'apt-get update; apt-get upgrade -y; apt-get full-upgrade -y;'
 ```
-  
-## Set up a second distro
-inspired by https://cloudbytes.dev/snippets/how-to-install-multiple-instances-of-ubuntu-in-wsl2
-and updated to the latest Version of Ubuntu. Run the following commands in a
-___PowerShell terminal___
-
-```
-Remove-Item alias:curl
-mkdir $HOME\wsl2
-cd $HOME\Downloads
-curl "https://cloud-images.ubuntu.com/wsl/lunar/current/ubuntu-lunar-wsl-amd64-wsl.rootfs.tar.gz" --output ubuntu-23.04-wsl-rootfs.tar.gz
-$WSL2_INSTANCE="ubuntu-2304-dev1"
-wsl --import $WSL2_INSTANCE $HOME\wsl2\$WSL2_INSTANCE .\ubuntu-23.04-wsl-rootfs.tar.gz
-wsl -d $WSL2_INSTANCE
-```
-
-The last command started your second WSL2 instance. Now you can create your user, set the password and ensure that 
-you are automatically logged in.
-
-Please replace `<USERNAME>` with your own username.
-
-```shell
-NEW_USER=<USERNAME>
-```
-```shell
-useradd -m -G sudo -s /bin/bash "$NEW_USER"
-passwd "$NEW_USER"
-```
-To ensure your user is login in by default instead of roo, execute the following command in the WSL instance:
-```shell
-tee /etc/wsl.conf -a <<_EOF
-[user]
-default=${NEW_USER}
-_EOF
-```
-
-You need to restart your WSL instance to activate the change. 
-Once you are successfully logged in, you can proceed with 
-- Install required linux packages
-- SSH config for git
-- Configure AWS CLI and saml2aws
 
 ## Remove a WSL instance
 Removal of a WSL2 instance is straight forward. 

wsl_install_software.sh

@@ -2,34 +2,41 @@
 # prepare a fresh WSL Ubuntu distro for development of dockerized python applications
 # provided by: tuteco GmbH - the data and knowledge experts
 
+# define the podman source repository
+sudo mkdir -p /etc/apt/keyrings
+curl -fsSL https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/xUbuntu_$(lsb_release -rs)/Release.key \
+  | gpg --dearmor \
+  | sudo tee /etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg > /dev/null
+echo \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg]\
+    https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/xUbuntu_$(lsb_release -rs)/ /" \
+  | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list > /dev/null
+
 # update and install required software packages
 sudo apt-get update \
 && sudo apt-get install --no-install-recommends -y \
 make build-essential libssl-dev zlib1g-dev \
 libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm \
 libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev \
-unzip rsync wslu binfmt-support
+unzip rsync wslu binfmt-support podman
+
+# enable the systemd socket to ensure docker compatibility
+systemctl --user enable podman.socket
+systemctl --user start podman.socket
+
+# create symbolc link to enable PyCharm compatibility to access the unix socket
+sudo ln -sfvT /run/user/${UID}/podman/podman.sock /var/run/docker.sock
 
 # required software tools directories
 mkdir -p .local/bin
 mkdir ~/tmp
 
-
 # aws cli installation
 curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
 unzip awscliv2.zip
 sudo ./aws/install
 rm awscliv2.zip
 
-# saml2aws installation
-CURRENT_VERSION=$(curl -Ls https://api.github.com/repos/Versent/saml2aws/releases/latest | grep 'tag_name' | cut -d'v' -f2 | cut -d'"' -f1)
-wget -c https://github.com/Versent/saml2aws/releases/download/v${CURRENT_VERSION}/saml2aws_${CURRENT_VERSION}_linux_amd64.tar.gz -O - | tar -xzv -C ~/.local/bin
-chmod u+x ~/.local/bin/saml2aws
-hash -r
-
-echo '' >> ~/.profile
-echo 'eval "$(saml2aws --completion-script-bash)"' >> ~/.profile
-
 # pyenv installation
 rm -rf ~/.pyenv
 curl https://pyenv.run | bash
@@ -59,24 +66,18 @@ echo '' >> ~/.bashrc
 curl https://raw.githubusercontent.com/tuteco/wsl-setup/main/git_branch_to_brashrc.txt >> ~/.bashrc
 
 # install the desired python versions
-# we use 3.10 as default version for productive use
-pyenv install 3.11.3
-pyenv install 3.10.11
-pyenv install 3.9.16
-pyenv global 3.10.11
+# we use 3.11 as default version for productive use
+pyenv install 3.11.4
+pyenv install 3.10.12
+pyenv global 3.11.4
 
 # install poetry
 curl -sSL https://install.python-poetry.org | python3 -
 
 # development directory structure
-mkdir -p ~/docker-volumes
-mkdir -p ~/workspace
-
-# ensure systemd gets started, so that we can use snap to install software
-sudo tee /etc/wsl.conf -a <<_EOF
-[boot]
-systemd=true
-_EOF
+mkdir -p ~/workspace/local_pg/db/data
+mkdir -p ~/workspace/pump_config
+mkdir -p ~/workspace/log
 
 echo '-------------------------------------------------------'
 echo 'please restart your WSL2 to activate all changes'