From 6d492e3bfd52f728c53bbb39574d572db4b7f574 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Thu, 15 Jun 2023 11:34:10 +0200 Subject: [PATCH] docker: Don't build concurrently. This fixes flaky builds on GitHub CI. --- docker/proxy/Dockerfile | 4 ++-- docker/server/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile index bcc9afa..26e6e79 100644 --- a/docker/proxy/Dockerfile +++ b/docker/proxy/Dockerfile @@ -6,8 +6,8 @@ WORKDIR /workdir COPY . . RUN apk add --no-cache bash git build-base protobuf && \ - if [ -d "vendor" ]; then GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOPROXY=off make proxy -j$(nproc); else \ - GOOS=${TARGETOS} GOARCH=${TARGETARCH} make proxy -j$(nproc); fi + if [ -d "vendor" ]; then GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOPROXY=off make proxy; else \ + GOOS=${TARGETOS} GOARCH=${TARGETARCH} make proxy; fi FROM alpine:3 diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index 98b78b3..a2a14a1 100644 --- a/docker/server/Dockerfile +++ b/docker/server/Dockerfile @@ -6,8 +6,8 @@ WORKDIR /workdir COPY . . RUN apk add --no-cache bash git build-base protobuf && \ - if [ -d "vendor" ]; then GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOPROXY=off make server -j$(nproc); else \ - GOOS=${TARGETOS} GOARCH=${TARGETARCH} make server -j$(nproc); fi + if [ -d "vendor" ]; then GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOPROXY=off make server; else \ + GOOS=${TARGETOS} GOARCH=${TARGETARCH} make server; fi FROM alpine:3