From 6403ae71b06e246e5685ff544ffde7d787c10daf Mon Sep 17 00:00:00 2001 From: Mark Van de Vyver <1335713+taqtiqa-admin@users.noreply.github.com> Date: Tue, 24 Mar 2020 12:54:12 +1100 Subject: [PATCH] Add building with Podman managed containers 1. Add Makefile target build-in-podman. 2. Update README.md. 3. Add gitignore .vscode. Signed-off-by: Mark Van de Vyver <1335713+taqtiqa-admin@users.noreply.github.com> --- .gitignore | 1 + Makefile | 3 +++ README.md | 8 +++++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f2c97a9..8809d7a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ firectl firectl.sha256 +.vscode \ No newline at end of file diff --git a/Makefile b/Makefile index e82ff9c..6f61cb0 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,9 @@ endif build-in-docker: docker run --rm -v $(CURDIR):/firectl --workdir /firectl golang:1.12 make +build-in-podman: + podman run --rm -v $(CURDIR):/firectl --workdir /firectl golang:1.12 make + test: go test -v ./... diff --git a/README.md b/README.md index 03a8806..8cbcd10 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,11 @@ installed on your computer. _We use [go modules](https://github.com/golang/go/wiki/Modules), so you need to build with Go 1.11 or newer._ -If you do not have a new-enough Go toolchain installed, you can use `make -build-in-docker`. This rule creates a temporary Docker container which builds -and copies the binary to your current directory. +If you do not have a new-enough Go toolchain installed, you can build in a +temporary container - the binary is copied to your current directory: + +1. `make build-in-docker` +1. `make build-in-podman` Usage ---