Skip to content

Commit

Permalink
update conctl version
Browse files Browse the repository at this point in the history
  • Loading branch information
totegamma committed Nov 26, 2024
1 parent c2755db commit 6a0c66a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions cmd/api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.5 AS coreBuilder
FROM golang:1.22.5 AS builder
WORKDIR /work

ARG VERSION
Expand All @@ -7,7 +7,7 @@ COPY ./go.mod ./go.sum ./
RUN go mod download && go mod verify
COPY ./ ./

RUN go install github.com/concrnt/conctl@v0.0.3
RUN go install github.com/concrnt/conctl@v1.0.1

RUN VERSION=${VERSION:-$(git describe)} \
&& BUILD_MACHINE=$(uname -srmo) \
Expand All @@ -18,7 +18,7 @@ RUN VERSION=${VERSION:-$(git describe)} \
FROM ubuntu:latest
RUN apt-get update && apt-get install -y ca-certificates curl --no-install-recommends && rm -rf /var/lib/apt/lists/*

COPY --from=coreBuilder /work/ccapi /usr/local/bin
COPY --from=coreBuilder /go/bin/conctl /usr/local/bin
COPY --from=builder /work/ccapi /usr/local/bin
COPY --from=builder /go/bin/conctl /usr/local/bin

CMD ["ccapi"]
8 changes: 4 additions & 4 deletions cmd/gateway/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.5 AS coreBuilder
FROM golang:1.22.5 AS builder
WORKDIR /work

ARG VERSION
Expand All @@ -7,7 +7,7 @@ COPY ./go.mod ./go.sum ./
RUN go mod download && go mod verify
COPY ./ ./

RUN go install github.com/concrnt/conctl@v0.0.3
RUN go install github.com/concrnt/conctl@v1.0.1

RUN VERSION=${VERSION:-$(git describe)} \
&& BUILD_MACHINE=$(uname -srmo) \
Expand All @@ -18,7 +18,7 @@ RUN VERSION=${VERSION:-$(git describe)} \
FROM ubuntu:latest
RUN apt-get update && apt-get install -y ca-certificates curl --no-install-recommends && rm -rf /var/lib/apt/lists/*

COPY --from=coreBuilder /work/ccgateway /usr/local/bin
COPY --from=coreBuilder /go/bin/conctl /usr/local/bin
COPY --from=builder /work/ccgateway /usr/local/bin
COPY --from=builder /go/bin/conctl /usr/local/bin

CMD ["ccgateway"]

0 comments on commit 6a0c66a

Please sign in to comment.