Skip to content

Commit e3bbb96

Browse files
authored
Merge pull request #17429 from MinaProtocol/dkijania/remove_unused_oses
[Clean Up] remove unused distros from CI
2 parents fe57c27 + 03f100c commit e3bbb96

File tree

6 files changed

+6
-179
lines changed

6 files changed

+6
-179
lines changed

buildkite/src/Constants/ContainerImages.dhall

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
"gcr.io/o1labs-192920/mina-toolchain@sha256:9eb216d62a319ba9ef9670e7b753d76f24db8f86ad638992e5095839348b401a"
1212
, minaToolchain =
1313
"gcr.io/o1labs-192920/mina-toolchain@sha256:bbeaa957443357adf132951fe780600821d817c40cfbc6c71a04eba5e97df97f"
14-
, elixirToolchain = "elixir:1.10-alpine"
15-
, nodeToolchain = "node:14.13.1-stretch-slim"
16-
, ubuntu2004 = "ubuntu:20.04"
1714
, postgres = "postgres:12.4-alpine"
1815
, xrefcheck =
1916
"dkhamsing/awesome_bot@sha256:a8adaeb3b3bd5745304743e4d8a6d512127646e420544a6d22d9f58a07f35884"

scripts/debian/builder-helpers.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ SUGGESTED_DEPS="jq, curl, wget"
2323
TEST_EXECUTIVE_DEPS=", mina-logproc, python3, docker"
2424

2525
case "${MINA_DEB_CODENAME}" in
26-
noble)
26+
noble|jammy)
2727
SHARED_DEPS="libssl3t64, libgmp10, libgomp1, tzdata, rocksdb-tools"
2828
DAEMON_DEPS=", libffi8, libjemalloc2, libpq-dev, libproc2-0 , mina-logproc"
2929
ARCHIVE_DEPS="libssl3t64, libgomp1, libpq-dev, libjemalloc2"
3030
;;
31-
bookworm|jammy)
31+
bookworm)
3232
SHARED_DEPS="libssl3, libgmp10, libgomp1, tzdata, rocksdb-tools"
3333
DAEMON_DEPS=", libffi8, libjemalloc2, libpq-dev, libproc2-0 , mina-logproc"
3434
ARCHIVE_DEPS="libssl3, libgomp1, libpq-dev, libjemalloc2"

scripts/docker/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function usage() {
2525
echo " -n, --network The network configuration to use (devnet or mainnet). Default=devnet"
2626
echo " -b, --branch The branch of the mina repository to use for staged docker builds. Default=compatible"
2727
echo " -r, --repo The currently used mina repository"
28-
echo " --deb-codename The debian codename (stretch or buster) to build the docker image from. Default=stretch"
28+
echo " --deb-codename The debian codename to build the docker image from. Default=bullseye"
2929
echo " --deb-release The debian package release channel to pull from (unstable,alpha,beta,stable). Default=unstable"
3030
echo " --deb-version The version string for the debian package to install"
3131
echo " --deb-profile The profile string for the debian package to install"

scripts/docker/helper.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ export VALID_SERVICES=('mina-archive' 'mina-daemon' 'mina-daemon-hardfork' 'mina
66
function export_base_image () {
77
# Determine the proper image for ubuntu or debian
88
case "${DEB_CODENAME##*=}" in
9-
bionic|focal|impish|jammy|noble)
9+
focal|jammy|noble)
1010
IMAGE="ubuntu:${DEB_CODENAME##*=}"
1111
;;
12-
stretch|buster|bullseye|sid)
12+
bullseye)
1313
IMAGE="debian:${DEB_CODENAME##*=}-slim"
1414
;;
1515
bookworm)

scripts/docker/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function usage() {
1717
echo " -n, --network The network configuration to use (devnet or mainnet). Default=devnet"
1818
echo " -b, --branch The branch of the mina repository to use for staged docker builds. Default=compatible"
1919
echo " -r, --repo The currently used mina repository"
20-
echo " --deb-codename The debian codename (stretch or buster) to build the docker image from. Default=stretch"
20+
echo " --deb-codename The debian codename (bullseye, noble or focal) to build the docker image from. Default=bullseye"
2121
echo " --deb-release The debian package release channel to pull from (unstable,alpha,beta,stable). Default=unstable"
2222
echo " --deb-version The version string for the debian package to install"
2323
echo " --deb-profile The profile string for the debian package to install"

scripts/release-docker.sh

Lines changed: 0 additions & 170 deletions
This file was deleted.

0 commit comments

Comments
 (0)