File tree Expand file tree Collapse file tree 8 files changed +217
-115
lines changed Expand file tree Collapse file tree 8 files changed +217
-115
lines changed Original file line number Diff line number Diff line change @@ -208,6 +208,7 @@ let docker_step
208208 [ DockerImage. ReleaseSpec:: {
209209 , deps = deps
210210 , service = Artifacts.Type. Archive
211+ , network = spec. network
211212 , deb_codename = spec. debVersion
212213 , deb_profile = spec. profile
213214 , build_flags = spec. buildFlags
Original file line number Diff line number Diff line change @@ -109,7 +109,7 @@ let toDebianName =
109109 { Daemon = " daemon_${Network.lowerName network}"
110110 , DaemonHardfork = " "
111111 , LogProc = " logproc"
112- , Archive = " archive "
112+ , Archive = " archive_${Network.lowerName network} "
113113 , TestExecutive = " test_executive"
114114 , BatchTxn = " batch_txn"
115115 , Rosetta = " rosetta_${Network.lowerName network}"
@@ -130,7 +130,7 @@ let toDebianNames =
130130 -> merge
131131 { Daemon = [ toDebianName a network ]
132132 , DaemonHardfork = [ toDebianName a network ]
133- , Archive = [ " archive " ]
133+ , Archive = [ toDebianName a network ]
134134 , LogProc = [ " logproc" ]
135135 , TestExecutive = [ " test_executive" ]
136136 , BatchTxn = [ " batch_txn" ]
Original file line number Diff line number Diff line change 1+ Introduced one package for one network for archive artifact
Original file line number Diff line number Diff line change @@ -5,6 +5,7 @@ FROM ${image}
55ARG deb_version
66ARG deb_codename=bullseye
77ARG deb_release=unstable
8+ ARG network=mainnet
89ARG deb_repo="http://packages.o1test.net"
910ARG deb_profile
1011ARG deb_suffix
@@ -13,9 +14,9 @@ ARG deb_suffix
1314ENV SUFFIX=${deb_suffix:+-${deb_suffix}}
1415# construct mina debian package name based on network and suffix.
1516# possible values:
16- # - mina-archive
17- # - mina-archive-lightnet etc.
18- ENV MINA_DEB=mina-archive${SUFFIX}
17+ # - mina-archive-mainnet
18+ # - mina-archive-devnet- lightnet etc.
19+ ENV MINA_DEB=mina-archive-${network} ${SUFFIX}
1920
2021ENV DEBIAN_FRONTEND noninteractive
2122RUN echo "Building image with version $deb_codename $deb_release $deb_version"
Original file line number Diff line number Diff line change @@ -102,7 +102,7 @@ RUN mkdir -p --mode=700 ${MINA_CONFIG_DIR}/wallets/store/ \
102102RUN echo "Building image with version $deb_version from repo $deb_release $deb_codename for network $network" \
103103 && echo "deb [trusted=yes] ${deb_repo} $deb_codename $deb_release" > /etc/apt/sources.list.d/o1.list \
104104 && apt-get update --quiet --yes \
105- && apt-get install --quiet --yes --allow-downgrades "mina-$network=$deb_version" "mina-rosetta-$network=$deb_version" "mina-archive=$deb_version" "mina-zkapp-test-transaction=$deb_version" \
105+ && apt-get install --quiet --yes --allow-downgrades "mina-$network=$deb_version" "mina-rosetta-$network=$deb_version" "mina-archive-$network =$deb_version" "mina-zkapp-test-transaction=$deb_version" \
106106 && rm -rf /var/lib/apt/lists/*
107107
108108# --- Set up postgres
Original file line number Diff line number Diff line change @@ -76,7 +76,7 @@ RUN locale-gen en_US.UTF-8
7676RUN echo "Building image with version $deb_version from repo $deb_release $deb_codename " \
7777 && echo "deb [trusted=yes] ${deb_repo} $deb_codename $deb_release" > /etc/apt/sources.list.d/o1.list \
7878 && apt-get update --quiet --yes \
79- && apt-get install --quiet --yes --allow-downgrades -o Dpkg::Options::="--force-overwrite" "mina-test-suite=$deb_version" "mina-$network-instrumented=$deb_version" "mina-archive-instrumented=$deb_version" \
79+ && apt-get install --quiet --yes --allow-downgrades -o Dpkg::Options::="--force-overwrite" "mina-test-suite=$deb_version" "mina-$network-instrumented=$deb_version" "mina-archive-$network- instrumented=$deb_version" \
8080 && rm -rf /var/lib/apt/lists/*
8181
8282ENTRYPOINT ["sleep","infinity"]
Original file line number Diff line number Diff line change @@ -24,7 +24,9 @@ if [ $# -eq 0 ]
2424 echo " No arguments supplied. Building all known debian packages"
2525 build_logproc_deb
2626 build_keypair_deb
27- build_archive_deb
27+ build_archive_berkeley_deb
28+ build_archive_devnet_deb
29+ build_archive_mainnet_deb
2830 build_batch_txn_deb
2931 build_daemon_berkeley_deb
3032 build_daemon_mainnet_deb
You can’t perform that action at this time.
0 commit comments