add watchexec to dogfood image (#3858)

ammario · web-flow · commit 1b3e75c3abee · 2022-09-03T18:38:13.000-05:00
* add watchexec to dogfood image

This comes in handy quite frequently.

* Fix dogfood image
diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile
@@ -2,7 +2,7 @@ FROM rust:slim AS rust-utils
 # Install rust helper programs
 # ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
 env CARGO_INSTALL_ROOT=/tmp/
-RUN cargo install exa bat ripgrep typos-cli
+RUN cargo install exa bat ripgrep typos-cli watchexec-cli
 
 FROM ubuntu AS go
 
@@ -160,14 +160,18 @@ RUN apt-get update --quiet && apt-get install --yes \
       podman \
       skopeo \
       fish \
-      gh \
 			unzip \
       zstd && \
     # Delete package cache to avoid consuming space in layer
     apt-get clean && \
     # Configure FIPS-compliant policies
     update-crypto-policies --set FIPS
 
+# See https://github.com/cli/cli/issues/6175#issuecomment-1235984381 for proof
+# the apt repository is unreliable
+RUN curl -L https://github.com/cli/cli/releases/download/v2.14.7/gh_2.14.7_linux_amd64.deb -o gh.deb && \
+    dpkg -i gh.deb
+
 # Install frontend utilities
 RUN apt-get update && \
     # Node.js (from nodesource) and Yarn (from yarnpkg)
diff --git a/dogfood/Makefile b/dogfood/Makefile
@@ -3,8 +3,8 @@
 branch=$(shell git rev-parse --abbrev-ref HEAD)
 build_tag=codercom/oss-dogfood:${branch}
 
-docker-build:
+build:
 	DOCKER_BUILDKIT=1 docker build . -t ${build_tag}
 
-docker-push: docker-build
+push: build
 	docker push ${build_tag}
