From b930f3287efdb56ee4bf20a9c1cef4935e64eaae Mon Sep 17 00:00:00 2001 From: danb Date: Wed, 3 Jan 2024 22:15:11 -0500 Subject: [PATCH 1/7] added berachain and docker handlers (#209) --- chains.yaml | 14 ++++++++++++++ dockerfile/none/Dockerfile | 2 ++ 2 files changed, 16 insertions(+) diff --git a/chains.yaml b/chains.yaml index c310e2d..c90b7c0 100644 --- a/chains.yaml +++ b/chains.yaml @@ -231,6 +231,20 @@ binaries: - /build/Basilisk-node/target/${ARCH}-unknown-linux-gnu/release/basilisk +#BeraChain +- name: berachain + dockerfile: none + pre-build: | + apt update -y + apt install -y wget libstdc++6 + wget -qq 'https://berad-private.s3.us-east-2.amazonaws.com/berad-linux-amd64-v0.0.6-alpha?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAXIHH4ECZJT5YBQR6%2F20231228%2Fus-east-2%2Fs3%2Faws4_request&X-Amz-Date=20231228T170607Z&X-Amz-Expires=604800&X-Amz-SignedHeaders=host&X-Amz-Signature=56ccce6310ea364bc78f4089b86749e9f642723ab49bf836dd7d544c55f120b6' -O berad + mv berad /usr/bin + chmod 555 /usr/bin/berad + binaries: + - /usr/bin/berad + platforms: + - linux/amd64 + # Bitcanna - name: bitcanna github-organization: BitCannaGlobal diff --git a/dockerfile/none/Dockerfile b/dockerfile/none/Dockerfile index 6f5a76b..ad520c5 100644 --- a/dockerfile/none/Dockerfile +++ b/dockerfile/none/Dockerfile @@ -1,4 +1,5 @@ FROM golang:bullseye AS build-env +# FROM ubuntu:22.04 ARG PRE_BUILD ARG VERSION @@ -33,6 +34,7 @@ ENV LIBRARIES_ENV ${LIBRARIES} RUN bash -c 'LIBRARIES_ARR=($LIBRARIES_ENV); for LIBRARY in "${LIBRARIES_ARR[@]}"; do cp $LIBRARY /root/lib/; done' FROM debian:bullseye +# FROM ubuntu:22.04 LABEL org.opencontainers.image.source="https://github.com/strangelove-ventures/heighliner" From c88e63a992c9cb02c0089e7074acb19248f6fbc7 Mon Sep 17 00:00:00 2001 From: vimystic <122659254+vimystic@users.noreply.github.com> Date: Tue, 6 Feb 2024 13:09:00 -0700 Subject: [PATCH 2/7] Update toolkit version (#216) --- dockerfile/avalanche/Dockerfile | 2 +- dockerfile/avalanche/native.Dockerfile | 2 +- dockerfile/cargo/Dockerfile | 2 +- dockerfile/cargo/native.Dockerfile | 2 +- dockerfile/cosmos/Dockerfile | 2 +- dockerfile/cosmos/local.Dockerfile | 2 +- dockerfile/cosmos/localcross.Dockerfile | 2 +- dockerfile/cosmos/native.Dockerfile | 2 +- dockerfile/imported/Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dockerfile/avalanche/Dockerfile b/dockerfile/avalanche/Dockerfile index c43bad3..3b929f3 100644 --- a/dockerfile/avalanche/Dockerfile +++ b/dockerfile/avalanche/Dockerfile @@ -101,7 +101,7 @@ RUN bash -c 'set -eux;\ LIBRARIES_ARR=($LIBRARIES_ENV); for LIBRARY in "${LIBRARIES_ARR[@]}"; do cp $LIBRARY /root/lib/; done' # Use minimal busybox from infra-toolkit image for final scratch image -FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.0 AS infra-toolkit +FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.4 AS infra-toolkit RUN addgroup --gid 1025 -S heighliner && adduser --uid 1025 -S heighliner -G heighliner # Use ln and rm from full featured busybox for assembling final image diff --git a/dockerfile/avalanche/native.Dockerfile b/dockerfile/avalanche/native.Dockerfile index 70a97d2..eeae4c5 100644 --- a/dockerfile/avalanche/native.Dockerfile +++ b/dockerfile/avalanche/native.Dockerfile @@ -78,7 +78,7 @@ RUN bash -c 'set -eux;\ LIBRARIES_ARR=($LIBRARIES_ENV); for LIBRARY in "${LIBRARIES_ARR[@]}"; do cp $LIBRARY /root/lib/; done' # Use minimal busybox from infra-toolkit image for final scratch image -FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.0 AS infra-toolkit +FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.4 AS infra-toolkit RUN addgroup --gid 1025 -S heighliner && adduser --uid 1025 -S heighliner -G heighliner # Use ln and rm from full featured busybox for assembling final image diff --git a/dockerfile/cargo/Dockerfile b/dockerfile/cargo/Dockerfile index cbb65f6..2d6da8e 100644 --- a/dockerfile/cargo/Dockerfile +++ b/dockerfile/cargo/Dockerfile @@ -146,7 +146,7 @@ RUN bash -c 'set -eux;\ done' # Use minimal busybox from infra-toolkit image for final scratch image -FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.0 AS infra-toolkit +FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.4 AS infra-toolkit RUN addgroup --gid 1025 -S heighliner && adduser --uid 1025 -S heighliner -G heighliner # Use ln and rm from full featured busybox for assembling final image diff --git a/dockerfile/cargo/native.Dockerfile b/dockerfile/cargo/native.Dockerfile index a57284b..6fcc796 100644 --- a/dockerfile/cargo/native.Dockerfile +++ b/dockerfile/cargo/native.Dockerfile @@ -160,7 +160,7 @@ RUN bash -c 'set -eux;\ done' # Use minimal busybox from infra-toolkit image for final scratch image -FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.0 AS infra-toolkit +FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.4 AS infra-toolkit RUN addgroup --gid 1025 -S heighliner && adduser --uid 1025 -S heighliner -G heighliner # Use ln and rm from full featured busybox for assembling final image diff --git a/dockerfile/cosmos/Dockerfile b/dockerfile/cosmos/Dockerfile index 6398984..083a7f4 100644 --- a/dockerfile/cosmos/Dockerfile +++ b/dockerfile/cosmos/Dockerfile @@ -106,7 +106,7 @@ RUN bash -c 'set -eux;\ LIBRARIES_ARR=($LIBRARIES_ENV); for LIBRARY in "${LIBRARIES_ARR[@]}"; do cp $LIBRARY /root/lib/; done' # Use minimal busybox from infra-toolkit image for final scratch image -FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.0 AS infra-toolkit +FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.4 AS infra-toolkit RUN addgroup --gid 1025 -S heighliner && adduser --uid 1025 -S heighliner -G heighliner # Use ln and rm from full featured busybox for assembling final image diff --git a/dockerfile/cosmos/local.Dockerfile b/dockerfile/cosmos/local.Dockerfile index 9f2671f..ecd593a 100644 --- a/dockerfile/cosmos/local.Dockerfile +++ b/dockerfile/cosmos/local.Dockerfile @@ -33,7 +33,7 @@ RUN set -eux; \ fi; # Use minimal busybox from infra-toolkit image for final scratch image -FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.0 AS infra-toolkit +FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.4 AS infra-toolkit RUN addgroup --gid 1025 -S heighliner && adduser --uid 1025 -S heighliner -G heighliner # Use ln and rm from full featured busybox for assembling final image diff --git a/dockerfile/cosmos/localcross.Dockerfile b/dockerfile/cosmos/localcross.Dockerfile index 8fa4023..2797e2f 100644 --- a/dockerfile/cosmos/localcross.Dockerfile +++ b/dockerfile/cosmos/localcross.Dockerfile @@ -106,7 +106,7 @@ RUN bash -c 'set -eux;\ LIBRARIES_ARR=($LIBRARIES_ENV); for LIBRARY in "${LIBRARIES_ARR[@]}"; do cp $LIBRARY /root/lib/; done' # Use minimal busybox from infra-toolkit image for final scratch image -FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.0 AS infra-toolkit +FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.4 AS infra-toolkit RUN addgroup --gid 1025 -S heighliner && adduser --uid 1025 -S heighliner -G heighliner # Use ln and rm from full featured busybox for assembling final image diff --git a/dockerfile/cosmos/native.Dockerfile b/dockerfile/cosmos/native.Dockerfile index bfce452..fcfc007 100644 --- a/dockerfile/cosmos/native.Dockerfile +++ b/dockerfile/cosmos/native.Dockerfile @@ -82,7 +82,7 @@ RUN bash -c 'set -eux;\ LIBRARIES_ARR=($LIBRARIES_ENV); for LIBRARY in "${LIBRARIES_ARR[@]}"; do cp $LIBRARY /root/lib/; done' # Use minimal busybox from infra-toolkit image for final scratch image -FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.0 AS infra-toolkit +FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.4 AS infra-toolkit RUN addgroup --gid 1025 -S heighliner && adduser --uid 1025 -S heighliner -G heighliner # Use ln and rm from full featured busybox for assembling final image diff --git a/dockerfile/imported/Dockerfile b/dockerfile/imported/Dockerfile index 110b62c..e05cfcf 100644 --- a/dockerfile/imported/Dockerfile +++ b/dockerfile/imported/Dockerfile @@ -3,7 +3,7 @@ ARG VERSION FROM $BASE_IMAGE:$VERSION AS imported # Use minimal busybox from infra-toolkit image for final scratch image -FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.0 AS infra-toolkit +FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.1.4 AS infra-toolkit RUN addgroup --gid 1025 -S heighliner && adduser --uid 1025 -S heighliner -G heighliner # Use ln and rm from full featured busybox for assembling final image From 2400378da86c351be8dd8c5b02f2054e8969a0f4 Mon Sep 17 00:00:00 2001 From: vimystic <122659254+vimystic@users.noreply.github.com> Date: Wed, 21 Feb 2024 21:25:28 -0700 Subject: [PATCH 3/7] Update to copy .a files to required dir's (#218) --- dockerfile/cosmos/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dockerfile/cosmos/Dockerfile b/dockerfile/cosmos/Dockerfile index 083a7f4..f49f786 100644 --- a/dockerfile/cosmos/Dockerfile +++ b/dockerfile/cosmos/Dockerfile @@ -53,6 +53,8 @@ RUN set -eux;\ WASMVM_REPO=$(echo $WASMVM_VERSION | awk '{print $1}');\ WASMVM_VERS=$(echo $WASMVM_VERSION | awk '{print $2}');\ wget -O $LIBDIR/libwasmvm_muslc.a https://${WASMVM_REPO}/releases/download/${WASMVM_VERS}/libwasmvm_muslc.${ARCH}.a;\ + cp $LIBDIR/libwasmvm_muslc.a $LIBDIR/libwasmvm.x86_64.a;\ + cp $LIBDIR/libwasmvm_muslc.a $LIBDIR/libwasmvm.aarch64.a;\ fi;\ export GOOS=linux GOARCH=$TARGETARCH CGO_ENABLED=1 LDFLAGS='-linkmode external -extldflags "-static"';\ if [ ! -z "$PRE_BUILD" ]; then sh -c "${PRE_BUILD}"; fi;\ From 037cae0271035e8550d1b5a104f3277fd598555d Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Fri, 23 Feb 2024 09:12:42 -0700 Subject: [PATCH 4/7] add tmp dir to cosmos images (#219) --- dockerfile/cosmos/Dockerfile | 1 + dockerfile/cosmos/local.Dockerfile | 2 +- dockerfile/cosmos/localcross.Dockerfile | 1 + dockerfile/cosmos/native.Dockerfile | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dockerfile/cosmos/Dockerfile b/dockerfile/cosmos/Dockerfile index f49f786..1f209bc 100644 --- a/dockerfile/cosmos/Dockerfile +++ b/dockerfile/cosmos/Dockerfile @@ -173,6 +173,7 @@ COPY --from=infra-toolkit /etc/ssl/cert.pem /etc/ssl/cert.pem # Install heighliner user COPY --from=infra-toolkit /etc/passwd /etc/passwd COPY --from=infra-toolkit --chown=1025:1025 /home/heighliner /home/heighliner +COPY --from=infra-toolkit --chown=1025:1025 /tmp /tmp WORKDIR /home/heighliner USER heighliner diff --git a/dockerfile/cosmos/local.Dockerfile b/dockerfile/cosmos/local.Dockerfile index ecd593a..7ed2c87 100644 --- a/dockerfile/cosmos/local.Dockerfile +++ b/dockerfile/cosmos/local.Dockerfile @@ -92,7 +92,7 @@ COPY --from=infra-toolkit /etc/ssl/cert.pem /etc/ssl/cert.pem # Install heighliner user COPY --from=infra-toolkit /etc/passwd /etc/passwd COPY --from=infra-toolkit --chown=1025:1025 /home/heighliner /home/heighliner - +COPY --from=infra-toolkit --chown=1025:1025 /tmp /tmp # Install chain binary FROM init-env AS build-env diff --git a/dockerfile/cosmos/localcross.Dockerfile b/dockerfile/cosmos/localcross.Dockerfile index 2797e2f..5c6284a 100644 --- a/dockerfile/cosmos/localcross.Dockerfile +++ b/dockerfile/cosmos/localcross.Dockerfile @@ -171,6 +171,7 @@ COPY --from=infra-toolkit /etc/ssl/cert.pem /etc/ssl/cert.pem # Install heighliner user COPY --from=infra-toolkit /etc/passwd /etc/passwd COPY --from=infra-toolkit --chown=1025:1025 /home/heighliner /home/heighliner +COPY --from=infra-toolkit --chown=1025:1025 /tmp /tmp WORKDIR /home/heighliner USER heighliner diff --git a/dockerfile/cosmos/native.Dockerfile b/dockerfile/cosmos/native.Dockerfile index fcfc007..ab7b6f9 100644 --- a/dockerfile/cosmos/native.Dockerfile +++ b/dockerfile/cosmos/native.Dockerfile @@ -147,6 +147,7 @@ COPY --from=infra-toolkit /etc/ssl/cert.pem /etc/ssl/cert.pem # Install heighliner user COPY --from=infra-toolkit /etc/passwd /etc/passwd COPY --from=infra-toolkit --chown=1025:1025 /home/heighliner /home/heighliner +COPY --from=infra-toolkit --chown=1025:1025 /tmp /tmp WORKDIR /home/heighliner USER heighliner From de6b6fad9be1e356734afbfa6b78f0da26a6d219 Mon Sep 17 00:00:00 2001 From: Mantas Vidutis Date: Thu, 25 Jul 2024 15:50:49 -0400 Subject: [PATCH 5/7] need for v50 --- chains.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chains.yaml b/chains.yaml index 628221e..46e36cf 100644 --- a/chains.yaml +++ b/chains.yaml @@ -1319,6 +1319,8 @@ github-organization: burnt-labs github-repo: xion dockerfile: cosmos + pre-build: + apk add --no-cache binutils-gold build-target: make install binaries: - /go/bin/xiond From 919fe49d2084f2ff89de657b803e62f844566a69 Mon Sep 17 00:00:00 2001 From: vimystic <122659254+vimystic@users.noreply.github.com> Date: Thu, 31 Oct 2024 23:38:36 -0600 Subject: [PATCH 6/7] keep the stub --- chains.yaml | 1 + 1 file changed, 1 insertion(+) create mode 100644 chains.yaml diff --git a/chains.yaml b/chains.yaml new file mode 100644 index 0000000..20290f7 --- /dev/null +++ b/chains.yaml @@ -0,0 +1 @@ +# This is a stub file. Please add new chains to the chains/ directory \ No newline at end of file From d2c5cc9599b29474f7492bae8d717488cbbf20ac Mon Sep 17 00:00:00 2001 From: vimystic <122659254+vimystic@users.noreply.github.com> Date: Thu, 31 Oct 2024 23:41:35 -0600 Subject: [PATCH 7/7] remove comments --- dockerfile/none/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/dockerfile/none/Dockerfile b/dockerfile/none/Dockerfile index ad520c5..6f5a76b 100644 --- a/dockerfile/none/Dockerfile +++ b/dockerfile/none/Dockerfile @@ -1,5 +1,4 @@ FROM golang:bullseye AS build-env -# FROM ubuntu:22.04 ARG PRE_BUILD ARG VERSION @@ -34,7 +33,6 @@ ENV LIBRARIES_ENV ${LIBRARIES} RUN bash -c 'LIBRARIES_ARR=($LIBRARIES_ENV); for LIBRARY in "${LIBRARIES_ARR[@]}"; do cp $LIBRARY /root/lib/; done' FROM debian:bullseye -# FROM ubuntu:22.04 LABEL org.opencontainers.image.source="https://github.com/strangelove-ventures/heighliner"