From 2778f41eea9b1364bb9a889a7acf1070b8dad15d Mon Sep 17 00:00:00 2001
From: Menny Even Danan <menny@evendanan.net>
Date: Sat, 2 Aug 2025 23:02:24 -0400
Subject: [PATCH 1/3] feat(android_dev): Add tmux and auto-start dev session

Installs tmux in the android_dev image.

Adds a script that, on login, automatically starts a tmux session
named dev-session or attaches to it if it already exists. This
streamlines the development workflow by ensuring the user is always
in a tmux session.
---
 android_dev/Dockerfile                | 7 +++++--
 android_dev/start_tmux_dev_session.sh | 6 ++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 android_dev/start_tmux_dev_session.sh

diff --git a/android_dev/Dockerfile b/android_dev/Dockerfile
index dd66f8e..a5327ff 100644
--- a/android_dev/Dockerfile
+++ b/android_dev/Dockerfile
@@ -41,7 +41,7 @@ RUN . "$NVM_DIR/nvm.sh" && pnpm add -g @google/gemini-cli@${GEMINI_CLI_VERSION}
 # Install dependencies
 RUN apt update \
     && apt install -y --allow-remove-essential --allow-change-held-packages \
-    zsh openssh-server \
+    zsh openssh-server tmux \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -67,13 +67,16 @@ RUN RUNZSH=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmy
 RUN echo "export NVM_DIR=${NVM_DIR}" >> /home/${ACTUAL_USER}/.zshrc && \
     echo "export PNPM_HOME=${PNPM_HOME}" >> /home/${ACTUAL_USER}/.zshrc && \
     echo "export PATH=${PATH}" >> /home/${ACTUAL_USER}/.zshrc && \
-    echo "source ${NVM_DIR}/nvm.sh" >> /home/${ACTUAL_USER}/.zshrc
+    echo "source ${NVM_DIR}/nvm.sh" >> /home/${ACTUAL_USER}/.zshrc && \
+    echo "exec /opt/workspace/start_tmux_dev_session.sh" >> /home/${ACTUAL_USER}/.zshrc
 
 # Switch back to root for remaining setup
 USER root
 
 COPY entrypoint.sh /opt/workspace/entrypoint.sh
+COPY start_tmux_dev_session.sh /opt/workspace/start_tmux_dev_session.sh
 RUN chmod +x /opt/workspace/entrypoint.sh
+RUN chmod +x /opt/workspace/start_tmux_dev_session.sh
 
 WORKDIR /opt/workspace
 
diff --git a/android_dev/start_tmux_dev_session.sh b/android_dev/start_tmux_dev_session.sh
new file mode 100644
index 0000000..e0f05f9
--- /dev/null
+++ b/android_dev/start_tmux_dev_session.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+# This script checks for a tmux session named "dev-session".
+# If the session exists, it attaches to it.
+# If it does not exist, it creates a new session with that name.
+
+tmux attach-session -t dev-session 2>/dev/null || tmux new-session -s dev-session

From 538ec0398e1dde6bf6ed16c0ab0cc75e158ad776 Mon Sep 17 00:00:00 2001
From: Menny Even Danan <menny@evendanan.net>
Date: Sat, 2 Aug 2025 23:04:40 -0400
Subject: [PATCH 2/3] Update versions.env

---
 .github/versions.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/versions.env b/.github/versions.env
index 6255303..f40bb43 100755
--- a/.github/versions.env
+++ b/.github/versions.env
@@ -1,3 +1,3 @@
-IMAGE_VERSION=1.21.5
+IMAGE_VERSION=1.21.6
 NDK_VERSION=27.2.12479018
 BAZELISK_VERSION=v1.26.0

From 773a0853f14aea658ab6b89128ea0ee2aa6a1059 Mon Sep 17 00:00:00 2001
From: Menny Even Danan <menny@evendanan.net>
Date: Sun, 3 Aug 2025 07:56:31 -0400
Subject: [PATCH 3/3] starting tmux not as exec

---
 android_dev/Dockerfile                | 4 +---
 android_dev/start_tmux_dev_session.sh | 6 ------
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 android_dev/start_tmux_dev_session.sh

diff --git a/android_dev/Dockerfile b/android_dev/Dockerfile
index a5327ff..475fd13 100644
--- a/android_dev/Dockerfile
+++ b/android_dev/Dockerfile
@@ -68,15 +68,13 @@ RUN echo "export NVM_DIR=${NVM_DIR}" >> /home/${ACTUAL_USER}/.zshrc && \
     echo "export PNPM_HOME=${PNPM_HOME}" >> /home/${ACTUAL_USER}/.zshrc && \
     echo "export PATH=${PATH}" >> /home/${ACTUAL_USER}/.zshrc && \
     echo "source ${NVM_DIR}/nvm.sh" >> /home/${ACTUAL_USER}/.zshrc && \
-    echo "exec /opt/workspace/start_tmux_dev_session.sh" >> /home/${ACTUAL_USER}/.zshrc
+    echo "tmux attach-session -t dev-session 2>/dev/null || tmux new-session -s dev-session" >> /home/${ACTUAL_USER}/.zshrc
 
 # Switch back to root for remaining setup
 USER root
 
 COPY entrypoint.sh /opt/workspace/entrypoint.sh
-COPY start_tmux_dev_session.sh /opt/workspace/start_tmux_dev_session.sh
 RUN chmod +x /opt/workspace/entrypoint.sh
-RUN chmod +x /opt/workspace/start_tmux_dev_session.sh
 
 WORKDIR /opt/workspace
 
diff --git a/android_dev/start_tmux_dev_session.sh b/android_dev/start_tmux_dev_session.sh
deleted file mode 100644
index e0f05f9..0000000
--- a/android_dev/start_tmux_dev_session.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# This script checks for a tmux session named "dev-session".
-# If the session exists, it attaches to it.
-# If it does not exist, it creates a new session with that name.
-
-tmux attach-session -t dev-session 2>/dev/null || tmux new-session -s dev-session