Skip to content

Commit

Permalink
revert dockerfile and only have shell script changes (apt to apt-get) (
Browse files Browse the repository at this point in the history
…#2917)

* Update Dockerfile with apt-get

* create multistage build for ci/docker and add apt-get to some of the shell scripts

* revert the dockerfile to its original place
  • Loading branch information
Killpit authored Sep 13, 2024
1 parent 031b1eb commit 875f8b4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/scripts/downstream-project-spl-install-deps.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
set -e

sudo apt update
sudo apt install libudev-dev binutils-dev libunwind-dev protobuf-compiler -y
sudo apt-get update
sudo apt-get install libudev-dev binutils-dev libunwind-dev protobuf-compiler -y
2 changes: 1 addition & 1 deletion ci/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,4 @@ RUN \
chmod +x codecov && \
mv codecov /usr/bin && \
# clean lists
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/*
6 changes: 3 additions & 3 deletions ci/setup-new-buildkite-agent/setup-new-machine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ check_ssh_authorized_keys || exit 1

set -ex

apt update
apt upgrade -y
apt-get update
apt-get upgrade -y

cat >/etc/apt/apt.conf.d/99-solana <<'EOF'
// Set and persist extra caps on iftop binary
Dpkg::Post-Invoke { "which iftop 2>&1 >/dev/null && setcap cap_net_raw=eip $(which iftop) || true"; };
EOF

apt install -y build-essential pkg-config clang cmake sysstat linux-tools-common \
apt-get install -y build-essential pkg-config clang cmake sysstat linux-tools-common \
linux-generic-hwe-18.04-edge linux-tools-generic-hwe-18.04-edge \
iftop heaptrack jq ruby python3-venv gcc-multilib libudev-dev

Expand Down

0 comments on commit 875f8b4

Please sign in to comment.