Skip to content

Commit 78ece5b

Browse files
authored
cannon: Fix support for state version 7 in latest docker builds (#18311)
Latest cannon now only supports state version 8, so ensure we use an older cannon for state version 7 when building multicannon.
1 parent 61eafeb commit 78ece5b

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

cannon/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ cannon64-impl:
3030
# Each embed is suffixed with the latest `StateVersion` number corresponding to the target VM and architecture.
3131
cannon-embeds: cannon64-impl
3232
# 64-bit multithreaded vm
33-
@cp bin/cannon64-impl ./multicannon/embeds/cannon-7
3433
@cp bin/cannon64-impl ./multicannon/embeds/cannon-8
3534

3635
cannon: cannon-embeds

ops/docker/op-stack-go/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/c
102102
FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/cannon:v1.2.0 AS cannon-builder-v1-2-0
103103
FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/cannon:v1.3.0 AS cannon-builder-v1-3-0
104104
FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/cannon:v1.4.0 AS cannon-builder-v1-4-0
105+
FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/cannon:v1.6.0 AS cannon-builder-v1-6-0
105106

106107
FROM --platform=$BUILDPLATFORM builder AS cannon-builder
107108
ARG CANNON_VERSION=v0.0.0
@@ -113,6 +114,7 @@ COPY --from=cannon-builder-v1-2-0 /usr/local/bin/cannon-3 ./cannon/multicannon/e
113114
COPY --from=cannon-builder-v1-3-0 /usr/local/bin/cannon-4 ./cannon/multicannon/embeds/cannon-4
114115
COPY --from=cannon-builder-v1-4-0 /usr/local/bin/cannon-5 ./cannon/multicannon/embeds/cannon-5
115116
COPY --from=cannon-builder-v1-4-0 /usr/local/bin/cannon-6 ./cannon/multicannon/embeds/cannon-6
117+
COPY --from=cannon-builder-v1-6-0 /usr/local/bin/cannon-7 ./cannon/multicannon/embeds/cannon-7
116118
# Build current binaries
117119
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd cannon && make cannon \
118120
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$CANNON_VERSION"

0 commit comments

Comments
 (0)