From f666b9a244ef282e3468830f9b60f770e35a271f Mon Sep 17 00:00:00 2001
From: Justin <justin@commando.io>
Date: Thu, 18 Mar 2021 00:44:42 -0500
Subject: [PATCH 1/2] zsh support in Docker container. Update fixuid to version
0.5
---
ci/release-image/Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ci/release-image/Dockerfile b/ci/release-image/Dockerfile
index c393e54b27b4..5772612d29f7 100644
--- a/ci/release-image/Dockerfile
+++ b/ci/release-image/Dockerfile
@@ -4,6 +4,7 @@ RUN apt-get update \
&& apt-get install -y \
curl \
dumb-init \
+ zsh \
htop \
locales \
man \
@@ -25,7 +26,7 @@ RUN adduser --gecos '' --disabled-password coder && \
echo "coder ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/nopasswd
RUN ARCH="$(dpkg --print-architecture)" && \
- curl -fsSL "https://github.com/boxboat/fixuid/releases/download/v0.4.1/fixuid-0.4.1-linux-$ARCH.tar.gz" | tar -C /usr/local/bin -xzf - && \
+ curl -fsSL "https://github.com/boxboat/fixuid/releases/download/v0.5/fixuid-0.5.0-linux-$ARCH.tar.gz" | tar -C /usr/local/bin -xzf - && \
chown root:root /usr/local/bin/fixuid && \
chmod 4755 /usr/local/bin/fixuid && \
mkdir -p /etc/fixuid && \
From 46542cde64c6a27008eca8ef54f08e0eec50fb32 Mon Sep 17 00:00:00 2001
From: Justin <justin@commando.io>
Date: Thu, 18 Mar 2021 00:51:22 -0500
Subject: [PATCH 2/2] correct the download url for fixuid
---
ci/release-image/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ci/release-image/Dockerfile b/ci/release-image/Dockerfile
index 5772612d29f7..4b63701494a2 100644
--- a/ci/release-image/Dockerfile
+++ b/ci/release-image/Dockerfile
@@ -26,7 +26,7 @@ RUN adduser --gecos '' --disabled-password coder && \
echo "coder ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/nopasswd
RUN ARCH="$(dpkg --print-architecture)" && \
- curl -fsSL "https://github.com/boxboat/fixuid/releases/download/v0.5/fixuid-0.5.0-linux-$ARCH.tar.gz" | tar -C /usr/local/bin -xzf - && \
+ curl -fsSL "https://github.com/boxboat/fixuid/releases/download/v0.5/fixuid-0.5-linux-$ARCH.tar.gz" | tar -C /usr/local/bin -xzf - && \
chown root:root /usr/local/bin/fixuid && \
chmod 4755 /usr/local/bin/fixuid && \
mkdir -p /etc/fixuid && \