Skip to content

Commit

Permalink
renames makefile commands
Browse files Browse the repository at this point in the history
  • Loading branch information
timbastin committed Feb 2, 2025
1 parent 10d0c95 commit 7a57f66
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 12 deletions.
13 changes: 5 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,18 @@ WORKDIR /go/src/app
COPY . .

RUN go mod download
RUN make app
RUN make cli

RUN mv /go/src/app/devguard-cli /go/bin/devguard-cli && \
mv /go/src/app/devguard /go/bin/app
RUN make devguard
RUN make devguard-cli

FROM alpine:3.20.2@sha256:0a4eaa0eecf5f8c050e5bba433f58c052be7587ee8af3e8b3910ef9ab5fbe9f5

WORKDIR /

COPY config/rbac_model.conf /config/rbac_model.conf
COPY --from=build /go/bin/app /
COPY --from=build /go/bin/devguard-cli /
COPY --from=build /go/src/app/devguard /
COPY --from=build /go/src/app/devguard-cli /
COPY templates /templates
COPY intoto-public-key.pem /intoto-public-key.pem
COPY cosign.pub /cosign.pub

CMD ["/app"]
CMD ["/devguard"]
2 changes: 1 addition & 1 deletion Dockerfile.scanner
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN curl -O -L "https://github.com/sigstore/cosign/releases/latest/download/cosi
COPY . .

# build the scanner
RUN make scanner
RUN make devguard-scanner
# ----------------------
# create final image with node:alpine
FROM alpine:3.20.2@sha256:0a4eaa0eecf5f8c050e5bba433f58c052be7587ee8af3e8b3910ef9ab5fbe9f5
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ mocks::
lint::
golangci-lint run ./...

app::
devguard::
go build $(FLAGS) -o devguard ./cmd/devguard/main.go

cli::
devguard-cli::
go build $(FLAGS) -o devguard-cli cmd/devguard-cli/main.go

scanner::
devguard-scanner::
go build $(FLAGS) -o devguard-scanner cmd/devguard-scanner/main.go

0 comments on commit 7a57f66

Please sign in to comment.