Skip to content

Commit 87c6214

Browse files
committed
fix dashboard build
1 parent f73a5a0 commit 87c6214

1 file changed

Lines changed: 18 additions & 14 deletions

File tree

  • packages/system/dashboard/images/kubeapps-apis

‎packages/system/dashboard/images/kubeapps-apis/Dockerfile‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,23 @@
33

44
# syntax = docker/dockerfile:1
55

6-
FROM bitnami/golang:1.23.2 AS builder
6+
FROM alpine as source
7+
ARG VERSION=v2.11.0
8+
RUN apk add --no-cache patch
9+
WORKDIR /source
10+
RUN wget -O- https://github.com/vmware-tanzu/kubeapps/archive/refs/tags/${VERSION}.tar.gz | tar xzf - --strip-components=1
11+
COPY fluxcd.diff /patches/fluxcd.diff
12+
COPY labels.diff /patches/labels.diff
13+
COPY reconcile-strategy.diff /patches/reconcile-strategy.diff
14+
COPY dashboard-resource.diff /patches/dashboard-resource.diff
15+
RUN patch -p1 < /patches/fluxcd.diff
16+
RUN patch -p1 < /patches/labels.diff
17+
RUN patch -p1 < /patches/reconcile-strategy.diff
18+
RUN patch -p1 < /patches/dashboard-resource.diff
19+
20+
FROM bitnami/golang:1.22.5 AS builder
721
WORKDIR /go/src/github.com/vmware-tanzu/kubeapps
8-
COPY go.mod go.sum ./
22+
COPY --from=source /source/go.mod /source/go.sum ./
923
ARG VERSION="devel"
1024
ARG TARGETARCH
1125

@@ -40,8 +54,8 @@ RUN --mount=type=cache,target=/go/pkg/mod \
4054

4155
# We don't copy the pkg and cmd directories until here so the above layers can
4256
# be reused.
43-
COPY pkg pkg
44-
COPY cmd cmd
57+
COPY --from=source /source/pkg pkg
58+
COPY --from=source /source/cmd cmd
4559

4660
RUN if [ ! -z ${lint:-} ]; then \
4761
# Run golangci-lint to detect issues
@@ -60,15 +74,6 @@ RUN --mount=type=cache,target=/go/pkg/mod \
6074
-ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/cmd.version=$VERSION" \
6175
./cmd/kubeapps-apis
6276

63-
# Build 'kapp-controller' plugin, version 'v1alpha1'
64-
RUN --mount=type=cache,target=/go/pkg/mod \
65-
--mount=type=cache,target=/root/.cache/go-build \
66-
GOPROXY="https://proxy.golang.org,direct" \
67-
go build \
68-
-ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/cmd.version=$VERSION" \
69-
-o /kapp-controller-packages-v1alpha1-plugin.so -buildmode=plugin \
70-
./cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/*.go
71-
7277
## Build 'fluxv2' plugin, version 'v1alpha1'
7378
RUN --mount=type=cache,target=/go/pkg/mod \
7479
--mount=type=cache,target=/root/.cache/go-build \
@@ -101,7 +106,6 @@ RUN --mount=type=cache,target=/go/pkg/mod \
101106
FROM bitnami/minideb:bookworm
102107
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
103108
COPY --from=builder /go/src/github.com/vmware-tanzu/kubeapps/kubeapps-apis /kubeapps-apis
104-
COPY --from=builder /kapp-controller-packages-v1alpha1-plugin.so /plugins/kapp-controller-packages/
105109
COPY --from=builder /fluxv2-packages-v1alpha1-plugin.so /plugins/fluxv2-packages/
106110
COPY --from=builder /helm-packages-v1alpha1-plugin.so /plugins/helm-packages/
107111
COPY --from=builder /resources-v1alpha1-plugin.so /plugins/resources/

0 commit comments

Comments
 (0)