From 343219eb8fb0aa6293b3db19fb6b0e048de25aae Mon Sep 17 00:00:00 2001 From: George MacRorie Date: Wed, 20 Nov 2024 13:57:41 +0000 Subject: [PATCH] fix: set path via workdir --- cmd/app/Dockerfile | 2 +- cmd/pipeline/Dockerfile | 4 ++-- cmd/pipeline/go.mod | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/cmd/app/Dockerfile b/cmd/app/Dockerfile index d2937ba..b059224 100644 --- a/cmd/app/Dockerfile +++ b/cmd/app/Dockerfile @@ -4,6 +4,6 @@ ADD . . WORKDIR cmd/app -RUN sh -c 'go build -ldflags "-X main.SHA=$(git rev-parse HEAD)" -o /bin/app ./cmd/app/.' +RUN sh -c 'go build -ldflags "-X main.SHA=$(git rev-parse HEAD)" -o /bin/app .' CMD "/bin/app" diff --git a/cmd/pipeline/Dockerfile b/cmd/pipeline/Dockerfile index 2bcdbb1..91c7866 100644 --- a/cmd/pipeline/Dockerfile +++ b/cmd/pipeline/Dockerfile @@ -2,8 +2,8 @@ FROM golang:1.23 ADD . . -WORKDIR cmd/app +WORKDIR cmd/pipeline -RUN sh -c 'go build -o /bin/pipeline ./cmd/pipeline/.' +RUN sh -c 'go build -o /bin/pipeline .' CMD "/bin/pipeline" diff --git a/cmd/pipeline/go.mod b/cmd/pipeline/go.mod index 8f721c7..d63ab75 100644 --- a/cmd/pipeline/go.mod +++ b/cmd/pipeline/go.mod @@ -3,7 +3,7 @@ module get-glu/gitops-example/pipeline go 1.23.3 require ( - github.com/get-glu/glu v0.0.1-prerelease2 + github.com/get-glu/glu v0.0.1-prerelease2.0.20241120131841-e88e710e168b github.com/get-glu/glu/ui v0.0.1-prerelease2 github.com/opencontainers/image-spec v1.1.0 k8s.io/api v0.31.2 @@ -62,7 +62,3 @@ require ( sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) - -replace github.com/get-glu/glu => ../../../../flipt-io/glu - -replace github.com/get-glu/glu/ui => ../../../../flipt-io/glu/ui