sd

gitpod/debian.Dockerfile

@@ -1,53 +1,42 @@
 FROM debian:latest
 
-# # FIXME: The script does not accept value from gitpod.io/settings
-# ENV GITPOD_IGNORE_BLOCKERS=1
-
-# # Blocked by https://github.com/gitpod-io/gitpod/issues/39
-# COPY gitpod/scripts/root-access.sh /usr/bin/root-access
-# RUN true "5g5fdhsfd" \
-# 	&& chmod +x /usr/bin/root-access \
-# 	&& /usr/bin/root-access \
-# 	&& rm /usr/bin/root-access
-
-# # Blocked by https://github.com/gitpod-io/gitpod/issues/1265
-# COPY gitpod/scripts/vm-support.sh /usr/bin/vm-support
-# RUN true "8g7as2dga7" \
-# 	&& chmod +x /usr/bin/vm-support \
-# 	&& /usr/bin/vm-support \
-# 	&& rm /usr/bin/vm-support
-
 # FIXME: Outputs `gitpod@ws-ce281d58-997b-44b8-9107-3f2da7feede3:/workspace/gitpod-tests1$` in terminal
 # FIXME: Add hadolint executable
 # FIXME: We can use /bin/sh instead of /bin/bash to get minor optimization
 
 # To avoid bricked workspaces (https://github.com/gitpod-io/gitpod/issues/1171)
-ARG DEBIAN_FRONTEND=noninteractive
+ARG DEBIAN_FRONTEND="noninteractive"
 
 USER root
 
-ENV LANG=en_US.UTF-8
-ENV LC_ALL=C
-
-# Add 'gitpod' user
-RUN useradd \
-	--uid 33333 \
-	--create-home --home-dir /home/gitpod \
-	--shell /bin/bash \
-	--password gitpod \
-	gitpod || exit 1
+ENV LANG="en_US.UTF-8"
+ENV LC_ALL="C"
 
 # Install dependencies
 RUN apt-get update \
-  && apt-get install -y rustc cargo pkg-config \
-  && : "Install hadolint if not available in downstream" \
+	&& apt-get install -y \
+		rustc \
+		cargo \
+		pkg-config \
+	# "Install hadolint if not available in downstream"
 	&& if ! apt-cache search hadolint | grep -qP "^hadolint -.*"; then { if ! command -v wget >/dev/null; then apt-get install -y wget; fi ;} && wget https://github.com/hadolint/hadolint/releases/download/v1.17.5/hadolint-Linux-x86_64 -O /usr/bin/hadolint && { [ ! -x /usr/bin/hadolint ] && chmod +x /usr/bin/hadolint ;}; elif apt-cache search hadolint | grep -qP "^hadolint -.*"; then apt-get install -y hadolint; fi \
 	&& curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh \
 	&& apt-get autoremove -y \
 	&& rm -rf /var/lib/apt/lists/*
 
+# Install sudo
+# FIXME-GITPOD(Krey): Disable cache for this so that it can be applied depending on priviledge in .gitpod.yml
+RUN true \
+	&& apt-get update -q \
+	&& apt-ige install -qy \
+		sudo \
+	&& apt-get autoremove -y \
+	&& rm -rf /var/lib/apt/lists/*
+
+
 # Add custom functions
-RUN if ! grep -qF 'ix()' /etc/bash.bashrc; then printf '%s\n' \
+RUN true \
+	&& if ! grep -qF 'ix()' /etc/bash.bashrc; then printf '%s\n' \
 	'# Custom' \
 	"ix() { curl -F 'f:1=<-' ix.io 2>/dev/null ;}" \
 	>> /etc/bash.bashrc; fi