Remove my Docker scripts; replace them with Ruby
- ID
67ce5bd- date
2024-04-07 18:30:01+00:00- author
Alex Chan <alex@alexwlchan.net>- parent
197f173- message
Remove my Docker scripts; replace them with Ruby- changed files
5 files, 3 additions, 65 deletions
Changed files
config.fish (7122) → config.fish (7232)
diff --git a/config.fish b/config.fish
index 4985b64..6124895 100644
--- a/config.fish
+++ b/config.fish
@@ -46,12 +46,14 @@ function prepend_to_path
end
end
+prepend_to_path /opt/homebrew/bin
+prepend_to_path /opt/homebrew/opt/ruby/bin
+prepend_to_path /opt/homebrew/lib/ruby/gems/3.3.0/gems/jekyll-4.3.3/exe
prepend_to_path /Library/Frameworks/Python.framework/Versions/3.12/bin
prepend_to_path ~/repos/scripts
prepend_to_path ~/repos/scripts/aws
-prepend_to_path ~/repos/scripts/docker
prepend_to_path ~/repos/scripts/fs
prepend_to_path ~/repos/scripts/git
prepend_to_path ~/repos/scripts/images
docker/README.md (483) → docker/README.md (0)
diff --git a/docker/README.md b/docker/README.md
deleted file mode 100644
index 6ae2540..0000000
--- a/docker/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# docker
-
-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/docker (386) → docker/docker (0)
diff --git a/docker/docker b/docker/docker
deleted file mode 100755
index 265d104..0000000
--- a/docker/docker
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-set -o errexit
-set -o nounset
-
-is_docker_running() {
- if /usr/local/bin/docker info > /dev/null 2>&1; then
- return 0
- else
- return 1
- fi
-}
-
-if ! is_docker_running; then
- echo "Starting Docker..."
- open /Applications/Docker.app
-
- for i in $(seq 60)
- do
- if is_docker_running; then
- break
- fi
- sleep 1
- done
-fi
-
-/usr/local/bin/docker "$@"
docker/rubocop (526) → docker/rubocop (0)
diff --git a/docker/rubocop b/docker/rubocop
deleted file mode 100755
index c23a5c3..0000000
--- a/docker/rubocop
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-# A wrapper around the Ruby linter/formatter 'rubocop'.
-#
-# This runs Rubocop inside a Docker container so I don't have to maintain
-# a working Ruby runtime on macOS.
-
-set -o errexit
-set -o nounset
-
-if ! docker images | grep alexwlchan/rubocop >/dev/null
-then
- pushd ~/repos/scripts/docker
- docker build \
- --no-cache \
- --tag alexwlchan/rubocop \
- --file rubocop.Dockerfile \
- .
- popd
-fi
-
-docker run \
- --volume $(pwd):/working \
- --workdir /working \
- alexwlchan/rubocop "$@"
docker/rubocop.Dockerfile (68) → docker/rubocop.Dockerfile (0)
diff --git a/docker/rubocop.Dockerfile b/docker/rubocop.Dockerfile
deleted file mode 100644
index e551158..0000000
--- a/docker/rubocop.Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM ruby:3.1-slim
-
-RUN gem install rubocop
-
-ENTRYPOINT ["rubocop"]