From 71a576c373cccb0361a57a440461805d5d3c456f Mon Sep 17 00:00:00 2001
From: Mario Romero <mario@1159.cl>
Date: Thu, 21 Sep 2023 04:29:04 -0300
Subject: [PATCH] Set default distribution to arch & analog-xk-web working

---
 README.md                                     | 13 +++++++--
 base/{arch.Dockerfile => desktop.Dockerfile}  |  0
 base/{webarch.Dockerfile => web.Dockerfile}   |  0
 ...rch.Dockerfile => analog-heavy.Dockerfile} |  0
 stacks/analog-xk.Dockerfile                   | 28 +++++++++++++++++++
 stacks/analog-xk/arch.Dockerfile              | 18 ------------
 .../arch.Dockerfile => analog-xm.Dockerfile}  |  0
 stacks/analog-xm/jammy.Dockerfile             | 12 --------
 ...rch.Dockerfile => digital-ator.Dockerfile} |  0
 9 files changed, 38 insertions(+), 33 deletions(-)
 rename base/{arch.Dockerfile => desktop.Dockerfile} (100%)
 rename base/{webarch.Dockerfile => web.Dockerfile} (100%)
 rename stacks/{analog-heavy/arch.Dockerfile => analog-heavy.Dockerfile} (100%)
 create mode 100644 stacks/analog-xk.Dockerfile
 delete mode 100644 stacks/analog-xk/arch.Dockerfile
 rename stacks/{analog-xm/arch.Dockerfile => analog-xm.Dockerfile} (100%)
 delete mode 100644 stacks/analog-xm/jammy.Dockerfile
 rename stacks/{digital-ator/arch.Dockerfile => digital-ator.Dockerfile} (100%)

diff --git a/README.md b/README.md
index f9a1acf..ed76875 100644
--- a/README.md
+++ b/README.md
@@ -56,11 +56,18 @@ docker run -it -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --name <cont
 Install `Xquartz` and run the linux previous command.
 
 ### 2. Connecting to the container
+
+#### Desktop
+
 After creating and starting the container, enter to it executing a shell with docker.
 ```sh
 docker exec -it <container_name> bash
 ```
 
+#### Web
+
+Connect from the web to the VNC client at `localhost:8444`.
+
 ### 3. Configure Volare
 
 List the available PDKs and choose one to install.
@@ -101,8 +108,8 @@ For creating an image with your own pre-installed set of packages for your team
 A singular stack image can be builded using docker in the following way from the repository root path.
 
 ```sh
-docker build -t osicstacks-base-arch -f base/Dockerfile .
-docker build -t <tag> -f stacks/<stack>/arch.Dockerfile .
+docker build --no-cache -t osicstacks-base-<desktop/web> -f base/<desktop/web>.Dockerfile .
+docker build --no-cache --build-arg BASE_IMG=osicstacks-base-<desktop/web> --target <stack>-<desktop/web> -t <tag> -f stacks/<stack>.Dockerfile .
 ```
 
 ### Local Run
@@ -117,4 +124,4 @@ powershell.exe -ExecutionPolicy Bypass run.ps1
 #### Linux
 ```sh
 docker run -it -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --name <container_name> <tag>
-```
\ No newline at end of file
+```
diff --git a/base/arch.Dockerfile b/base/desktop.Dockerfile
similarity index 100%
rename from base/arch.Dockerfile
rename to base/desktop.Dockerfile
diff --git a/base/webarch.Dockerfile b/base/web.Dockerfile
similarity index 100%
rename from base/webarch.Dockerfile
rename to base/web.Dockerfile
diff --git a/stacks/analog-heavy/arch.Dockerfile b/stacks/analog-heavy.Dockerfile
similarity index 100%
rename from stacks/analog-heavy/arch.Dockerfile
rename to stacks/analog-heavy.Dockerfile
diff --git a/stacks/analog-xk.Dockerfile b/stacks/analog-xk.Dockerfile
new file mode 100644
index 0000000..c0962e5
--- /dev/null
+++ b/stacks/analog-xk.Dockerfile
@@ -0,0 +1,28 @@
+# OSIC Stacks - analog-xk
+# Dev enviroment for analog circuits development using xschem and klayout.
+ARG BASE_IMG=osicstacks-base-native
+FROM $BASE_IMG as analog-xk
+
+# Update packages
+RUN sudo pacman -Syuq --noconfirm
+
+# Install packages
+RUN sudo aur-install xschem klayout
+
+RUN pip install gdsfactory --break-system-packages
+RUN pip install gf180 --upgrade --break-system-packages
+
+# Clean cache
+RUN sudo pacman -Scc
+
+# - Desktop build
+FROM analog-xk as analog-xk-desktop
+
+# Initialize the environment keeping container alive
+CMD ["sleep", "infinity"]
+
+# - Web build
+FROM analog-xk as analog-xk-web
+
+# Run VNC server & desktop environment
+CMD ["startserver"]
diff --git a/stacks/analog-xk/arch.Dockerfile b/stacks/analog-xk/arch.Dockerfile
deleted file mode 100644
index b00b39e..0000000
--- a/stacks/analog-xk/arch.Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# OSIC Stacks - analog-xk-arch
-# Dev enviroment for analog circuits development using xschem and klayout.
-FROM osicstack-base-arch
-
-# Update packages
-RUN sudo pacman -Syuq --noconfirm
-
-# Install packages
-RUN sudo aur-install xschem klayout
-
-RUN pip install gdsfactory --break-system-packages
-RUN pip install gf180 --upgrade --break-system-packages
-
-# Clean cache
-RUN sudo pacman -Scc
-
-# Initialize the enviroment keeping container alive
-CMD ["sleep", "infinity"]
\ No newline at end of file
diff --git a/stacks/analog-xm/arch.Dockerfile b/stacks/analog-xm.Dockerfile
similarity index 100%
rename from stacks/analog-xm/arch.Dockerfile
rename to stacks/analog-xm.Dockerfile
diff --git a/stacks/analog-xm/jammy.Dockerfile b/stacks/analog-xm/jammy.Dockerfile
deleted file mode 100644
index 644c782..0000000
--- a/stacks/analog-xm/jammy.Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-# OSIC Stacks - analog-xm-jammy
-# Dev enviroment for analog circuits development using xschem and magic.
-FROM phusion/baseimage:jammy-1.0.1
-
-# Install packages
-RUN install_clean xschem magic python3 python3-pip xz-utils git
-
-# Install volare
-RUN python3 -m pip install --upgrade --no-cache-dir volare
-
-# Initialize the enviroment keeping container alive
-CMD ["sleep", "infinity"]
\ No newline at end of file
diff --git a/stacks/digital-ator/arch.Dockerfile b/stacks/digital-ator.Dockerfile
similarity index 100%
rename from stacks/digital-ator/arch.Dockerfile
rename to stacks/digital-ator.Dockerfile