From a269822c461a75289a2a173623975b2901e9b9d5 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 18 Sep 2022 22:17:32 +0200 Subject: [PATCH] fix local build env Signed-off-by: Markus Blaschke --- Dockerfile.develop | 5 +---- Makefile | 13 +++++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Dockerfile.develop b/Dockerfile.develop index d989048..3c388fb 100644 --- a/Dockerfile.develop +++ b/Dockerfile.develop @@ -5,9 +5,6 @@ RUN apt-get update \ && apt-get -y -f dist-upgrade \ && apt-get install -y -f \ build-essential \ - linux-libc-dev \ - gcc-multilib \ - g++-multilib \ vim \ nano \ git \ @@ -64,7 +61,7 @@ RUN go mod download COPY . /go/src/github.com/webdevops/go-crond # Build and install -RUN make build-local \ +RUN make build \ && cp -a go-crond /usr/local/bin ENV SERVER_BIND=":8080" \ diff --git a/Makefile b/Makefile index ff909ca..b7a4c8c 100644 --- a/Makefile +++ b/Makefile @@ -92,3 +92,16 @@ release-assets/%: $(SOURCE) GOARCH=$(call word-dot,$*,2) \ CGO_ENABLED=0 \ time go build -ldflags '$(LDFLAGS)' -o './release-assets/$(PROJECT_NAME).$(call word-dot,$*,1).$(call word-dot,$*,2)' . + +####################################### +# development +####################################### + +docker-dev: + docker build -f Dockerfile.develop . -t webdevops/go-crond:develop + +docker-run: docker-dev + docker run -ti --rm -w "$$(pwd)" -v "$$(pwd):$$(pwd):ro" -p 8080:8080 -e SERVER_METRICS=1 --name=cron webdevops/go-crond:develop bash + +build-env: docker-dev + docker run -ti --rm -w "$$(pwd)" -v "$$(pwd):$$(pwd)" -p 8080:8080 -e SERVER_METRICS=1 --name=cron webdevops/go-crond:develop bash