summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIan Lewis <ianlewis@google.com>2019-12-06 09:05:46 -0500
committerIan Lewis <ianlewis@google.com>2020-01-14 17:00:07 +0900
commit2274c9929a0feff9dab29b72a8f0395077e15ad8 (patch)
treee35efcb68051f149f3e2936313323850885d0ff6
parent6e5080f5dc3527b2382bd2a91f7d5eace4793b17 (diff)
Add --rm to docker run commands.
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 8aa490ab1..2c54efa60 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,7 @@ $(APP_TARGET): public $(APP_SOURCE)
static-production: hugo-docker-image compatibility-docs node_modules config.toml $(shell find archetypes assets content themes -type f | sed 's/ /\\ /g')
docker run \
+ --rm \
-e HUGO_ENV="production" \
-e USER="$(shell id -u)" \
-e HOME="/tmp" \
@@ -56,6 +57,7 @@ static-production: hugo-docker-image compatibility-docs node_modules config.toml
static-staging: hugo-docker-image compatibility-docs node_modules config.toml $(shell find archetypes assets content themes -type f | sed 's/ /\\ /g')
docker run \
+ --rm \
-e HUGO_ENV="production" \
-e USER="$(shell id -u)" \
-e HOME="/tmp" \
@@ -71,6 +73,7 @@ node_modules: package.json package-lock.json
# Use npm ci because npm install will update the package-lock.json.
# See: https://github.com/npm/npm/issues/18286
docker run \
+ --rm \
-e USER="$(shell id -u)" \
-e HOME="/tmp" \
-u="$(shell id -u):$(shell id -g)" \
@@ -82,6 +85,7 @@ node_modules: package.json package-lock.json
upstream/gvisor/bazel-bin/runsc/linux_amd64_pure_stripped/runsc: upstream-gvisor
mkdir -p /tmp/gvisor-website/build_output
docker run \
+ --rm \
-v $(PWD)/upstream/gvisor:/workspace \
-v /tmp/gvisor-website/build_output:/tmp/gvisor-website/build_output \
-w /workspace \
@@ -107,6 +111,7 @@ check: htmlproofer-docker-image website
# Run a local content development server. Redirects will not be supported.
devserver: hugo-docker-image all-upstream compatibility-docs
docker run \
+ --rm \
-e USER="$(shell id -u)" \
-e HOME="/tmp" \
-u="$(shell id -u):$(shell id -g)" \
@@ -124,11 +129,6 @@ server: website
cd public/ && go run main.go --custom-domain localhost
.PHONY: server
-# Deploy the website to App Engine.
-deploy: website
- cd public && $(GCLOUD) app deploy
-.PHONY: deploy
-
# Stage the website to App Engine at a version based on the git branch name.
stage: all-upstream app static-staging
# Disallow indexing staged content.