From 9545fccbef376e8b4e8d7fdf3c7b05ed4429c099 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Mon, 24 Feb 2025 09:22:33 +0100 Subject: [PATCH] remove generate stap from image Signed-off-by: Christian Richter --- opencloud/Makefile | 4 ++++ opencloud/docker/Dockerfile.linux.multiarch | 12 +----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/opencloud/Makefile b/opencloud/Makefile index 523ea45b35..f87b35fe7f 100644 --- a/opencloud/Makefile +++ b/opencloud/Makefile @@ -38,6 +38,10 @@ dev-docker: ########### multiarch-docker ########### .PHONY: dev-docker-multiarch dev-docker-multiarch: + @echo "+-------------------------------------------------------------------------+" + @echo "| Are you sure you have run make ci-node-generate in the repository root? |" + @echo "+-------------------------------------------------------------------------+" + sleep 10 docker buildx rm opencloudbuilder || true docker buildx create --platform linux/arm64,linux/amd64 --name opencloudbuilder docker buildx use opencloudbuilder diff --git a/opencloud/docker/Dockerfile.linux.multiarch b/opencloud/docker/Dockerfile.linux.multiarch index 4e6ba650b7..213f708dbc 100644 --- a/opencloud/docker/Dockerfile.linux.multiarch +++ b/opencloud/docker/Dockerfile.linux.multiarch @@ -1,19 +1,9 @@ -FROM owncloudci/nodejs:18 AS generate -ARG TARGETARCH - -COPY ./ /opencloud/ - -WORKDIR /opencloud/opencloud -ARG TARGETARCH - -RUN make ci-node-generate - FROM golang:alpine3.20 AS build ARG TARGETARCH RUN apk add bash make git curl gcc musl-dev libc-dev binutils-gold inotify-tools vips-dev -COPY --from=generate /opencloud /opencloud +COPY ./ /opencloud/ WORKDIR /opencloud/opencloud RUN GOOS=linux GOARCH="${TARGETARCH}" make ci-go-generate build ENABLE_VIPS=true