Skip to main content

make docker nicer

ID
5c08643
date
2023-05-15 19:45:32+00:00
author
Alex Chan <alex@alexwlchan.net>
parent
fb9e65d
message
make docker nicer
changed files
5 files, 7 additions, 13 deletions

Changed files

docker/README.md (292) → docker/README.md (483)

diff --git a/docker/README.md b/docker/README.md
index b25fa5c..6ae2540 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -3,3 +3,6 @@
 These scripts are all Docker-based wrappers for tools of the same name (`cloc`, `rubocop`, and so on).
 
 I prefer to use Docker over installing packages directly on my system because I've had multiple headaches with Mac package managers, whereas Docker works fairly reliably for me.
+
+The `docker` script is a wrapper around the real Docker CLI.
+I don't always have Docker running; this wrapper intercepts all calls to `docker` and starts Docker if it isn't already running.

docker/cloc (592) → docker/cloc (565)

diff --git a/docker/cloc b/docker/cloc
index bdd5876..b6e690c 100755
--- a/docker/cloc
+++ b/docker/cloc
@@ -3,8 +3,6 @@
 set -o errexit
 set -o nounset
 
-_ensure_docker_is_running
-
 # Note: the --platform line is to silence this warning on Apple Silicon:
 #
 #     WARNING: The requested image's platform (linux/amd64) does not

docker/_ensure_docker_is_running (470) → docker/docker (320)

diff --git a/docker/_ensure_docker_is_running b/docker/docker
similarity index 70%
rename from docker/_ensure_docker_is_running
rename to docker/docker
index dd38336..fc6dbfa 100755
--- a/docker/_ensure_docker_is_running
+++ b/docker/docker
@@ -1,22 +1,19 @@
 #!/usr/bin/env bash
-# This script checks to see if Docker is running, and if not, it starts
-# Docker.
-#
-# This is a prefix to several of my scripts that rely on Docker being
-# present; it saves me having to start Docker myself.
 
 set -o errexit
 set -o nounset
 
-if ! docker info > /dev/null 2>&1; then
+if ! /usr/local/bin/docker info > /dev/null 2>&1; then
   echo "Starting Docker..."
   open /Applications/Docker.app
 
   for i in $(seq 60)
   do
-    if docker info > /dev/null 2>&1; then
+    if /usr/local/bin/docker info > /dev/null 2>&1; then
       break
     fi
     sleep 1
   done
 fi
+
+/usr/local/bin/docker "$@"

docker/rubocop (538) → docker/rubocop (511)

diff --git a/docker/rubocop b/docker/rubocop
index 1cef37d..fe6d562 100755
--- a/docker/rubocop
+++ b/docker/rubocop
@@ -7,8 +7,6 @@
 set -o errexit
 set -o nounset
 
-_ensure_docker_is_running
-
 if ! docker images | grep alexwlchan/rubocop >/dev/null
 then
   pushd ~/repos/pathscripts/docker

terraform/tflint (334) → terraform/tflint (307)

diff --git a/terraform/tflint b/terraform/tflint
index 5b2c75b..dabbdce 100755
--- a/terraform/tflint
+++ b/terraform/tflint
@@ -7,8 +7,6 @@
 set -o errexit
 set -o nounset
 
-_ensure_docker_is_running
-
 docker run --rm --tty \
   --volume $(pwd):/data \
   ghcr.io/terraform-linters/tflint --recursive "$@"