Skip to content

Commit

Permalink
fixup docker build
Browse files Browse the repository at this point in the history
  • Loading branch information
bschimke95 committed Jun 28, 2024
1 parent d4ee7ed commit 487e0b4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
10 changes: 1 addition & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ ENV GOPROXY=$goproxy
COPY go.mod go.mod
COPY go.sum go.sum

# Cache deps before building and copying source so that we don't need to re-download as much
# and so that source changes don't invalidate our downloaded layer
RUN --mount=type=cache,target=/go/pkg/mod \
go mod download

# Copy the sources
COPY ./ ./

Expand All @@ -50,10 +45,7 @@ ARG package=.
ARG ARCH
ARG ldflags

# Do not force rebuild of up-to-date packages (do not use -a) and use the compiler cache folder
RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/go/pkg/mod \
CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} \
Run CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} \
go build -trimpath -ldflags "${ldflags} -extldflags '-static'" \
-o manager ${package}

Expand Down
3 changes: 3 additions & 0 deletions test/e2e/cluster_upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ import (
)

var _ = Describe("Workload cluster upgrade [CK8s-Upgrade]", func() {
// TODO(bschimke): Remove once we find a way to run e2e tests with other infrastructure providers that support snap.
Skip("Skipping the upgrade tests as snap does not work on CAPD.")

Context("Upgrading a cluster with 1 control plane", func() {
ClusterUpgradeSpec(ctx, func() ClusterUpgradeSpecInput {
return ClusterUpgradeSpecInput{
Expand Down

0 comments on commit 487e0b4

Please sign in to comment.