From d61b3476962fd1e27911fc73550e6ec52debd316 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Fri, 7 Jul 2023 21:12:03 +0800
Subject: Code server no longer install softwares.

Install them yourself!
---
 docker/code-server/Dockerfile               | 7 +------
 docker/code-server/install-code-server.bash | 4 +++-
 docker/code-server/install-dev-tools.bash   | 6 ++----
 3 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'docker/code-server')

diff --git a/docker/code-server/Dockerfile b/docker/code-server/Dockerfile
index 6794935..9a43f5e 100644
--- a/docker/code-server/Dockerfile
+++ b/docker/code-server/Dockerfile
@@ -1,13 +1,8 @@
 FROM debian:latest
 
-ARG GIT_NAME=crupest
-ARG GIT_EMAIL=${CRUPEST_EMAIL}
-ENV GIT_NAME=$GIT_NAME
-ENV GIT_EMAIL=$GIT_EMAIL
-
 WORKDIR /scripts
 COPY *.bash /scripts/
-RUN /scripts/install-code-server.bash && /scripts/install-dev-tools.bash && rm -r /scripts
+RUN /scripts/install-code-server.bash
 
 ENV LANG en_US.utf8
 ENV CODE_SERVER_CONFIG="/data/code-server-config.yaml"
diff --git a/docker/code-server/install-code-server.bash b/docker/code-server/install-code-server.bash
index 57eea80..b2c15ab 100755
--- a/docker/code-server/install-code-server.bash
+++ b/docker/code-server/install-code-server.bash
@@ -4,7 +4,7 @@ set -e
 
 apt-get update
 apt-get install -y locales curl
-rm -rf /var/lib/apt/lists/*
+
 localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 
 VERSION=$(curl -s https://api.github.com/repos/coder/code-server/releases/latest | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/')
@@ -20,3 +20,5 @@ dpkg -i "code-server_${VERSION}_amd64.deb"
 rm "code-server_${VERSION}_amd64.deb"
 
 echo "Code-server version: $(code-server --version)."
+
+rm -rf /var/lib/apt/lists/*
diff --git a/docker/code-server/install-dev-tools.bash b/docker/code-server/install-dev-tools.bash
index 0358f9b..3f64743 100755
--- a/docker/code-server/install-dev-tools.bash
+++ b/docker/code-server/install-dev-tools.bash
@@ -6,11 +6,9 @@ apt-get update
 apt-get install -y vim lsb-release wget git software-properties-common gnupg
 apt-get install -y gcc g++ make gdb
 
-git config --global user.email "$GIT_EMAIL"
-git config --global user.name "$GIT_NAME"
+# git config --global user.email "$GIT_EMAIL"
+# git config --global user.name "$GIT_NAME"
 
 source ./install-llvm.bash
 source ./install-cmake.bash
 source ./install-dotnet.bash
-
-rm -rf /var/lib/apt/lists/*
-- 
cgit v1.2.3