Use existing container if available

Author: cmoog

ci/dev-image/Dockerfile

@@ -4,7 +4,6 @@ RUN apt-get update && apt-get install -y \
     curl \
     iproute2 \
     vim \
-    libgpgme-dev \
     iptables \
     net-tools \
     libsecret-1-dev \

ci/dev-image/exec.sh

@@ -8,21 +8,14 @@ git submodule update --init
 
 container_name=code-server-dev
 
-# Docker build is very verbose even when everything is cached.
-echo "--- Building $container_name"
-cd ../../ && docker build -t $container_name -f ./ci/dev-image/Dockerfile . > /dev/null
-
-set +e
-container_id=$(docker container inspect --format="{{.Id}}" $container_name 2>/dev/null)
-
-if [ $? -eq "0" ]; then
-    echo "--- Killing $container_name"
-    docker rm -f $container_name 2>/dev/null
-fi
-set -e
-
-echo "--- Spawning $container_name"
-container_id=$(docker run \
+enter() {
+  echo "--- Entering $container_name"
+  docker exec -it $container_id /bin/bash
+}
+
+run() {
+  echo "--- Spawning $container_name"
+  container_id=$(docker run \
     -it \
     --privileged \
     --name $container_name \
@@ -32,19 +25,26 @@ container_id=$(docker run \
     $([[ -t 0 ]] && echo -it || true) \
     -d \
     $container_name)
+}
 
-set +e
+build() {
+  echo "--- Building $container_name"
+  cd ../../ && docker build -t $container_name -f ./ci/dev-image/Dockerfile . > /dev/null
+}
 
-echo "--- Executing: $@"
+set +e
+container_id=$(docker container inspect --format="{{.Id}}" $container_name 2> /dev/null)
 
-CMD="$@"
+if [ $? -eq "0" ]; then
+  set -e
+  echo "-- Starting container"
+  docker start $container_id > /dev/null
 
-docker exec \
-    $([[ -t 0 ]] && echo -it || true) \
-    $container_id \
-    bash -c "$CMD"
+  enter
+  exit 0
+fi
 
-docker exec \
-    $([[ -t 0 ]] && echo -it || true) \
-    $container_id \
-    bash
+set -e
+build
+run
+enter

doc/CONTRIBUTING.md

@@ -13,7 +13,11 @@ yarn watch # Visit http://localhost:8080 once completed.
 To develop inside of an isolated docker container:
 
 ```shell
-./ci/dev-image/exec.sh bash -c 'yarn && yarn vscode && yarn watch'  # Visit http://localhost:8080 once completed.
+./ci/dev-image/exec.sh
+
+root@12345:/code-server# yarn
+root@12345:/code-server# yarn vscode
+root@12345:/code-server# yarn watch
 ```
 
 Any changes made to the source will be live reloaded.