From ec2d01ab400bb8cb35234ce879c98e4b71e00261 Mon Sep 17 00:00:00 2001 From: pokemonlover1234 Date: Wed, 13 Mar 2019 14:22:36 -0400 Subject: [PATCH 1/3] Add git to docker container Install git in the docker container, proposed by #203. While it is possible that issue requires further discussion, this is just a proposal pull request. If that proposal is accepted, here's the pull request. --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 440cb018..509d4f2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,10 @@ FROM node:8.15.0 -# Install VS Code's deps. These are the only two it seems we need. +# Install VS Code's deps. These are the only two it seems we need. Install git for source control. RUN apt-get update && apt-get install -y \ libxkbfile-dev \ - libsecret-1-dev + libsecret-1-dev \ + git # Ensure latest yarn. RUN npm install -g yarn@1.13 From 3a6e27bc87ab6dcf6fb69230fc361a6d520cf439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Mar 2019 11:01:51 +0100 Subject: [PATCH 2/3] Combine apt-get in final docker image and remove cache --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 509d4f2d..adaeb3d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,9 +23,10 @@ COPY --from=0 /src/packages/server/cli-linux-x64 /usr/local/bin/code-server EXPOSE 8443 RUN apt-get update && apt-get install -y \ openssl \ - net-tools -RUN apt-get install -y locales && \ - locale-gen en_US.UTF-8 + net-tools \ + locales && \ + locale-gen en_US.UTF-8 && \ + rm -rf /var/lib/apt/lists/* # We unfortunately cannot use update-locale because docker will not use the env variables # configured in /etc/default/locale so we need to set it manually. ENV LANG=en_US.UTF-8 From 862c94401a25204137ba17253b35fe5fbf9156c3 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 13 Mar 2019 15:00:36 -0400 Subject: [PATCH 3/3] Dockerfile: include git Closes #221 Closes #230 Closes #203 --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index adaeb3d0..fc291567 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,9 @@ FROM node:8.15.0 -# Install VS Code's deps. These are the only two it seems we need. Install git for source control. +# Install VS Code's deps. These are the only two it seems we need. RUN apt-get update && apt-get install -y \ libxkbfile-dev \ - libsecret-1-dev \ - git + libsecret-1-dev # Ensure latest yarn. RUN npm install -g yarn@1.13 @@ -21,12 +20,13 @@ FROM ubuntu:18.10 WORKDIR /root/project COPY --from=0 /src/packages/server/cli-linux-x64 /usr/local/bin/code-server EXPOSE 8443 + RUN apt-get update && apt-get install -y \ openssl \ net-tools \ - locales && \ - locale-gen en_US.UTF-8 && \ - rm -rf /var/lib/apt/lists/* + git \ + locales +RUN locale-gen en_US.UTF-8 # We unfortunately cannot use update-locale because docker will not use the env variables # configured in /etc/default/locale so we need to set it manually. ENV LANG=en_US.UTF-8