Skip to content

Commit d76dc3a

Browse files
ifplusorifplusor
authored
build: fix dockerfile (#627)
Signed-off-by: James Yin <[email protected]>
1 parent a657cb5 commit d76dc3a

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

‎Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ build: build-root build-controller build-timer build-trigger build-gateway build
3232
docker-push-store:
3333
docker buildx build --platform ${DOCKER_PLATFORM} -t ${DOCKER_REPO}/${IMAGE_PREFIX}store:${IMAGE_TAG} -f build/images/store/Dockerfile . --push
3434
docker-build-store:
35-
docker build -t ${DOCKER_REPO}/${IMAGE_PREFIX}store:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/store/Dockerfile .
35+
docker buildx build --platform ${DOCKER_PLATFORM} -t ${DOCKER_REPO}/${IMAGE_PREFIX}store:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/store/Dockerfile .
3636
build-store:
3737
$(GO_BUILD) -o bin/store cmd/store/main.go
3838

3939
docker-push-gateway:
4040
docker buildx build --platform ${DOCKER_PLATFORM} -t ${DOCKER_REPO}/${IMAGE_PREFIX}gateway:${IMAGE_TAG} -f build/images/gateway/Dockerfile . --push
4141
docker-build-gateway:
42-
docker build -t ${DOCKER_REPO}/${IMAGE_PREFIX}gateway:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/gateway/Dockerfile .
42+
docker buildx build --platform ${DOCKER_PLATFORM} -t ${DOCKER_REPO}/${IMAGE_PREFIX}gateway:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/gateway/Dockerfile .
4343
build-gateway:
4444
$(GO_BUILD) -o bin/gateway cmd/gateway/main.go
4545

@@ -72,28 +72,28 @@ build-cmd: build-vsctl
7272
docker-push-root:
7373
docker buildx build --platform ${DOCKER_PLATFORM} -t ${DOCKER_REPO}/${IMAGE_PREFIX}root-controller:${IMAGE_TAG} -f build/images/root-controller/Dockerfile . --push
7474
docker-build-root:
75-
docker build -t ${DOCKER_REPO}/${IMAGE_PREFIX}root-controller:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/root-controller/Dockerfile .
75+
docker buildx build --platform ${DOCKER_PLATFORM} -t ${DOCKER_REPO}/${IMAGE_PREFIX}root-controller:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/root-controller/Dockerfile .
7676
build-root:
7777
$(GO_BUILD) -o bin/root-controller cmd/root/main.go
7878

7979
docker-push-controller:
8080
docker buildx build --platform ${DOCKER_PLATFORM} -t ${DOCKER_REPO}/${IMAGE_PREFIX}controller:${IMAGE_TAG} -f build/images/controller/Dockerfile . --push
8181
docker-build-controller:
82-
docker build -t ${DOCKER_REPO}/${IMAGE_PREFIX}controller:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/controller/Dockerfile .
82+
docker buildx build --platform ${DOCKER_PLATFORM} -t ${DOCKER_REPO}/${IMAGE_PREFIX}controller:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/controller/Dockerfile .
8383
build-controller:
8484
$(GO_BUILD) -o bin/controller cmd/controller/main.go
8585

8686
docker-push-trigger:
8787
docker buildx build --platform ${DOCKER_PLATFORM} -t ${DOCKER_REPO}/${IMAGE_PREFIX}trigger:${IMAGE_TAG} -f build/images/trigger/Dockerfile . --push
8888
docker-build-trigger:
89-
docker build -t ${DOCKER_REPO}/${IMAGE_PREFIX}trigger:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/trigger/Dockerfile .
89+
docker buildx build --platform ${DOCKER_PLATFORM} -t ${DOCKER_REPO}/${IMAGE_PREFIX}trigger:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/trigger/Dockerfile .
9090
build-trigger:
9191
$(GO_BUILD) -o bin/trigger cmd/trigger/main.go
9292

9393
docker-push-timer:
9494
docker buildx build --platform ${DOCKER_PLATFORM} -t ${DOCKER_REPO}/${IMAGE_PREFIX}timer:${IMAGE_TAG} -f build/images/timer/Dockerfile . --push
9595
docker-build-timer:
96-
docker build -t ${DOCKER_REPO}/${IMAGE_PREFIX}timer:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/timer/Dockerfile .
96+
docker buildx build --platform ${DOCKER_PLATFORM} -t ${DOCKER_REPO}/${IMAGE_PREFIX}timer:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/timer/Dockerfile .
9797
build-timer:
9898
$(GO_BUILD) -o bin/timer cmd/timer/main.go
9999

‎build/images/controller/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ FROM --platform=$BUILDPLATFORM golang:1.19 as builder
33
WORKDIR /workspace
44

55
# pre-copy/cache go.mod for pre-downloading dependencies and only redownloading them in subsequent builds if they change
6-
COPY go.mod go.sum ./
7-
RUN go mod download && go mod verify
6+
# COPY go.mod go.sum ./
7+
# RUN go mod download && go mod verify
88

99
ARG TARGETOS
1010
ARG TARGETARCH

‎build/images/gateway/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ FROM --platform=$BUILDPLATFORM golang:1.19 as builder
33
WORKDIR /workspace
44

55
# pre-copy/cache go.mod for pre-downloading dependencies and only redownloading them in subsequent builds if they change
6-
COPY go.mod go.sum ./
7-
RUN go mod download && go mod verify
6+
# COPY go.mod go.sum ./
7+
# RUN go mod download && go mod verify
88

99
ARG TARGETOS
1010
ARG TARGETARCH

‎build/images/root-controller/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ FROM --platform=$BUILDPLATFORM golang:1.19 as builder
33
WORKDIR /workspace
44

55
# pre-copy/cache go.mod for pre-downloading dependencies and only redownloading them in subsequent builds if they change
6-
COPY go.mod go.sum ./
7-
RUN go mod download && go mod verify
6+
# COPY go.mod go.sum ./
7+
# RUN go mod download && go mod verify
88

99
ARG TARGETOS
1010
ARG TARGETARCH

‎build/images/store/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ FROM --platform=$BUILDPLATFORM golang:1.19 as builder
33
WORKDIR /workspace
44

55
# pre-copy/cache go.mod for pre-downloading dependencies and only redownloading them in subsequent builds if they change
6-
COPY go.mod go.sum ./
7-
RUN go mod download && go mod verify
6+
# COPY go.mod go.sum ./
7+
# RUN go mod download && go mod verify
88

99
ARG TARGETOS
1010
ARG TARGETARCH

‎build/images/timer/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ FROM --platform=$BUILDPLATFORM golang:1.19 as builder
33
WORKDIR /workspace
44

55
# pre-copy/cache go.mod for pre-downloading dependencies and only redownloading them in subsequent builds if they change
6-
COPY go.mod go.sum ./
7-
RUN go mod download && go mod verify
6+
# COPY go.mod go.sum ./
7+
# RUN go mod download && go mod verify
88

99
ARG TARGETOS
1010
ARG TARGETARCH

‎build/images/trigger/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ FROM --platform=$BUILDPLATFORM golang:1.19 as builder
33
WORKDIR /workspace
44

55
# pre-copy/cache go.mod for pre-downloading dependencies and only redownloading them in subsequent builds if they change
6-
COPY go.mod go.sum ./
7-
RUN go mod download && go mod verify
6+
# COPY go.mod go.sum ./
7+
# RUN go mod download && go mod verify
88

99
ARG TARGETOS
1010
ARG TARGETARCH

0 commit comments

Comments
 (0)