Skip to content

Commit 6cc31e8

Browse files
authored
Merge pull request #172 from infrablocks/fix-ci-base-image
Fix CI base image and add libsodium
2 parents 72f164c + 44a4655 commit 6cc31e8

2 files changed

Lines changed: 13 additions & 4 deletions

File tree

.circleci/config.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ orbs:
44
slack: circleci/slack@4.13.2
55

66
base_container: &base_container
7-
image: buildpack-deps:buster
7+
image: buildpack-deps:bookworm
88

99
build_container: &build_container
1010
resource_class: arm.medium
@@ -69,15 +69,16 @@ commands:
6969
configure_build_tools:
7070
steps:
7171
- run: ./scripts/ci/common/install-slack-deps.sh
72+
- run: ./scripts/ci/common/install-libsodium.sh
7273
- restore_cache:
7374
keys:
74-
- asdf-dependencies-{{ arch }}-v2-{{ checksum ".tool-versions" }}
75-
- asdf-dependencies-{{ arch }}-v2-
75+
- asdf-dependencies-{{ arch }}-v3-{{ checksum ".tool-versions" }}
76+
- asdf-dependencies-{{ arch }}-v3-
7677
- run: ./scripts/ci/common/install-asdf.sh
7778
- run: ./scripts/ci/common/configure-asdf.sh
7879
- run: ./scripts/ci/common/install-asdf-dependencies.sh
7980
- save_cache:
80-
key: asdf-dependencies-{{ arch }}-v2-{{ checksum ".tool-versions" }}
81+
key: asdf-dependencies-{{ arch }}-v3-{{ checksum ".tool-versions" }}
8182
paths:
8283
- ~/.asdf
8384

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env bash
2+
3+
[ -n "$DEBUG" ] && set -x
4+
set -e
5+
set -o pipefail
6+
7+
apt-get update
8+
apt-get install -y --no-install-recommends libsodium-dev

0 commit comments

Comments
 (0)