Add buildbase.sh script to simplify initializing base images (#233)

Nathan Potter · web-flow · commit eeaae6e6d544 · 2019-06-27T10:48:54.000-05:00
diff --git a/images/README.md b/images/README.md
@@ -58,4 +58,7 @@ extensions or tooling.
 
 `buildpush.sh` - This script takes an image name, i.e. `ubuntu-dev-go1.12`, changes into the specified directory,
 and calls `buildlang.sh` and `push.sh` to build the language image and push the finalized image to the codercom
-docker hub.
+docker hub.
+
+`buildbase.sh` - This script builds both of the base images and is run via `main.sh` or should be run before
+doing a `buildpush.sh` for a specific language.
diff --git a/images/buildbase.sh b/images/buildbase.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -eu
+
+BASE_IMAGE=ubuntu-dev
+
+# Build the base for all images.
+pushd base
+    docker build -t sail-base --label com.coder.sail.base_image=sail-base .
+popd
+
+# Build our base ubuntu-dev image for non language specific environments.
+pushd $BASE_IMAGE
+    ./buildpush.sh
+popd
diff --git a/images/main.sh b/images/main.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 set -eu
 
-BASE_IMAGE=ubuntu-dev
 
 LANG_IMAGES=(
     ubuntu-dev-gcc8
@@ -14,15 +13,8 @@ LANG_IMAGES=(
     ubuntu-dev-ruby2.6
 )
 
-# Build the base for all images.
-pushd base
-    docker build -t sail-base --label com.coder.sail.base_image=sail-base .
-popd
+./buildbase.sh
 
-# Build our base ubuntu-dev image for non language specific environments.
-pushd $BASE_IMAGE
-    ./buildpush.sh
-popd
 
 # Build all our language specific environments.
 for lang in "${LANG_IMAGES[@]}"; do
