Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions buildkite/src/Command/MinaArtifact.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,16 @@ let pipeline : DebianVersions.DebVersion -> Pipeline.Config.Type = \(debVersion
in
DockerImage.generateStep archiveSpec,

-- archive image
let archiveSpec = DockerImage.ReleaseSpec::{
deps=DebianVersions.dependsOn debVersion,
service="mina-archive-maintenance",
deb_codename="${DebianVersions.lowerName debVersion}",
step_key="archive-maintenance-${DebianVersions.lowerName debVersion}-docker-image"
}
in
DockerImage.generateStep archiveSpec,

-- rosetta image
let rosettaSpec = DockerImage.ReleaseSpec::{
service="mina-rosetta",
Expand Down
8 changes: 4 additions & 4 deletions buildkite/src/Constants/ContainerImages.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
{
toolchainBase = "codaprotocol/ci-toolchain-base:v3",
minaToolchainStretch = "gcr.io/o1labs-192920/mina-toolchain@sha256:e4920236094ab23caad9ec9cda39babde6b777541db054e8138f71ac464f57b5",
minaToolchainBuster = "gcr.io/o1labs-192920/mina-toolchain@sha256:eea4b6cd7ce0a92649bd8d8283c97a94c0cf70ce00fd63c3d08f1bfc15d2531d",
minaToolchainBullseye = "gcr.io/o1labs-192920/mina-toolchain@sha256:73562fcc35dcabd342f66f1d69ae12704e92d69edc0b37e7c88b4d11bc623f23",
minaToolchainBookworm = "gcr.io/o1labs-192920/mina-toolchain@sha256:73562fcc35dcabd342f66f1d69ae12704e92d69edc0b37e7c88b4d11bc623f23",
minaToolchain = "gcr.io/o1labs-192920/mina-toolchain@sha256:73562fcc35dcabd342f66f1d69ae12704e92d69edc0b37e7c88b4d11bc623f23",
minaToolchainBuster = "gcr.io/o1labs-192920/mina-toolchain@sha256:671a0d42224f9fe364cac5c0b35b42fe2a947ea5f838806f2b02fdfd82519f43",
minaToolchainBullseye = "gcr.io/o1labs-192920/mina-toolchain@sha256:d9561c6dfe0e77106233f6e000fa249f41abc26ced742cd641717e4d133afcc9",
minaToolchainBookworm = "gcr.io/o1labs-192920/mina-toolchain@sha256:d9561c6dfe0e77106233f6e000fa249f41abc26ced742cd641717e4d133afcc9",
minaToolchain = "gcr.io/o1labs-192920/mina-toolchain@sha256:d9561c6dfe0e77106233f6e000fa249f41abc26ced742cd641717e4d133afcc9",
delegationBackendToolchain = "gcr.io/o1labs-192920/delegation-backend-production@sha256:8ca5880845514ef56a36bf766a0f9de96e6200d61b51f80d9f684a0ec9c031f4",
elixirToolchain = "elixir:1.10-alpine",
nodeToolchain = "node:14.13.1-stretch-slim",
Expand Down
43 changes: 43 additions & 0 deletions dockerfiles/Dockerfile-mina-archive-maintenance
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
ARG image=debian:bullseye-slim
FROM ${image}

# Run with `docker build --build-arg deb_version=<version>`
ARG deb_version
ARG deb_codename=stretch
ARG deb_release=alpha

ENV DEBIAN_FRONTEND noninteractive
RUN echo "Building image with version $deb_codename $deb_release $deb_version"

COPY scripts/archive-entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh

# Dependencies
RUN apt-get update --quiet --yes \
&& apt-get upgrade --quiet --yes \
&& apt-get install --quiet --yes --no-install-recommends \
procps \
curl \
jq \
dumb-init \
libssl1.1 \
libgomp1 \
libpq-dev \
apt-transport-https \
ca-certificates \
dnsutils \
tzdata \
postgresql \
postgresql-contrib \
apt-utils \
procps \
man \
&& rm -rf /var/lib/apt/lists/*

# archive-node package
RUN echo "deb [trusted=yes] http://packages.o1test.net $deb_codename $deb_release" > /etc/apt/sources.list.d/o1.list \
&& apt-get update --quiet --yes \
&& apt-get install --quiet --yes "mina-archive=$deb_version" "mina-archive-maintenance=$deb_version" \
&& rm -rf /var/lib/apt/lists/*

ENTRYPOINT ["/usr/bin/dumb-init", "/entrypoint.sh"]
1 change: 1 addition & 0 deletions dockerfiles/stages/1-build-deps
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ RUN apt-get update --quiet \
curl \
file \
git \
git-lfs \
'(^lld-10$|^lld-11$)' \
m4 \
pkg-config \
Expand Down
3 changes: 2 additions & 1 deletion scripts/archive/build-release-archives.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ dune build "--profile=${DUNE_PROFILE}" src/app/replayer/replayer.exe

cd _build

PROJECT="mina-maintenance-replayer"
PROJECT="mina-archive-maintenance"
BUILD_DIR="deb_build"

###### replayer deb
Expand Down Expand Up @@ -116,6 +116,7 @@ cat "${BUILD_DIR}/DEBIAN/control"

echo "------------------------------------------------------------"
# Binaries
rm -rf "${BUILDDIR}/usr/local/bin"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is scary to me, i hope it is needed :o

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i see now.

mkdir -p "${BUILD_DIR}/usr/local/bin"
pwd
ls
Expand Down
21 changes: 0 additions & 21 deletions scripts/archive/caqti-compatible.patch
Original file line number Diff line number Diff line change
@@ -1,24 +1,3 @@
diff --git a/buildkite/src/Constants/ContainerImages.dhall b/buildkite/src/Constants/ContainerImages.dhall
index 9e8b7a9a72d..11412f019ac 100644
--- a/buildkite/src/Constants/ContainerImages.dhall
+++ b/buildkite/src/Constants/ContainerImages.dhall
@@ -5,11 +5,11 @@
-- NOTE: minaToolchainBookworm is also used for building Ubuntu Jammy packages in CI
{
toolchainBase = "codaprotocol/ci-toolchain-base:v3",
- minaToolchainStretch = "gcr.io/o1labs-192920/mina-toolchain@sha256:e4920236094ab23caad9ec9cda39babde6b777541db054e8138f71ac464f57b5",
- minaToolchainBuster = "gcr.io/o1labs-192920/mina-toolchain@sha256:eea4b6cd7ce0a92649bd8d8283c97a94c0cf70ce00fd63c3d08f1bfc15d2531d",
- minaToolchainBullseye = "gcr.io/o1labs-192920/mina-toolchain@sha256:73562fcc35dcabd342f66f1d69ae12704e92d69edc0b37e7c88b4d11bc623f23",
- minaToolchainBookworm = "gcr.io/o1labs-192920/mina-toolchain@sha256:73562fcc35dcabd342f66f1d69ae12704e92d69edc0b37e7c88b4d11bc623f23",
- minaToolchain = "gcr.io/o1labs-192920/mina-toolchain@sha256:73562fcc35dcabd342f66f1d69ae12704e92d69edc0b37e7c88b4d11bc623f23",
+ minaToolchainStretch = "gcr.io/o1labs-192920/mina-toolchain@sha256:5e46491494ba1630962fc160a96e28262a1ccd782780033f313478f7ed6e9d59",
+ minaToolchainBuster = "gcr.io/o1labs-192920/mina-toolchain@sha256:91c034a9dd2b1a9bbc8d8fc36c01555ea84463f391c36473810e6711574162cf",
+ minaToolchainBullseye = "gcr.io/o1labs-192920/mina-toolchain@sha256:5e46491494ba1630962fc160a96e28262a1ccd782780033f313478f7ed6e9d59",
+ minaToolchainBookworm = "gcr.io/o1labs-192920/mina-toolchain@sha256:5e46491494ba1630962fc160a96e28262a1ccd782780033f313478f7ed6e9d59",
+ minaToolchain = "gcr.io/o1labs-192920/mina-toolchain@sha256:5e46491494ba1630962fc160a96e28262a1ccd782780033f313478f7ed6e9d59",
delegationBackendToolchain = "gcr.io/o1labs-192920/delegation-backend-production@sha256:8ca5880845514ef56a36bf766a0f9de96e6200d61b51f80d9f684a0ec9c031f4",
elixirToolchain = "elixir:1.10-alpine",
nodeToolchain = "node:14.13.1-stretch-slim",
diff --git a/opam.export b/opam.export
index c532c30d0a7..390ba09bcb6 100644
--- a/opam.export
Expand Down
6 changes: 5 additions & 1 deletion scripts/release-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set +x
CLEAR='\033[0m'
RED='\033[0;31m'
# Array of valid service names
VALID_SERVICES=('mina-archive', 'mina-daemon' 'mina-rosetta' 'mina-toolchain' 'bot' 'leaderboard' 'delegation-backend' 'delegation-backend-toolchain' 'mina-test-executive')
VALID_SERVICES=('mina-archive', 'mina-archive-maintenance', 'mina-daemon' 'mina-rosetta' 'mina-toolchain' 'bot' 'leaderboard' 'delegation-backend' 'delegation-backend-toolchain' 'mina-test-executive')

function usage() {
if [[ -n "$1" ]]; then
Expand Down Expand Up @@ -81,6 +81,10 @@ mina-daemon)
DOCKER_CONTEXT="dockerfiles/"
VERSION="${VERSION}-${NETWORK##*=}"
;;
mina-archive-maintenance)
DOCKERFILE_PATH="dockerfiles/Dockerfile-mina-archive-maintenance"
DOCKER_CONTEXT="dockerfiles/"
;;
mina-toolchain)
DOCKERFILE_PATH="dockerfiles/stages/1-build-deps dockerfiles/stages/2-opam-deps dockerfiles/stages/3-toolchain"
;;
Expand Down