Skip to content

Commit 7856fd8

Browse files
committed
feat: Update Docker image and Cargo updates
1 parent a8f9b6a commit 7856fd8

File tree

3 files changed

+40
-41
lines changed

3 files changed

+40
-41
lines changed

Cargo.lock

Lines changed: 28 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ authors = ["GeekMasher"]
77
license = "MIT"
88

99
edition = "2024"
10-
rust-version = "1.85"
10+
rust-version = "1.87"
1111

1212
publish = false
1313

@@ -16,9 +16,9 @@ publish = false
1616
[dependencies]
1717
log = "0.4"
1818
env_logger = "0.11"
19-
tokio = { version = "1", features = ["full"] }
20-
anyhow = "1"
21-
thiserror = "2"
19+
tokio = { version = "1.45", features = ["full"] }
20+
anyhow = "1.0"
21+
thiserror = "2.0"
2222
dotenvy = "0.15"
2323
glob = "0.3"
2424
# Actions

Dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/library/rust:1.85-slim as builder
1+
FROM docker.io/library/rust:1.87-slim AS builder
22

33
ENV TARGET=x86_64-unknown-linux-gnu
44

@@ -9,17 +9,19 @@ COPY . .
99
# Install dependencies
1010
RUN apt-get update && \
1111
apt-get install -y --no-install-recommends pkg-config build-essential libssl-dev && \
12-
cargo build --release && \
13-
mv target/release/codeql-extractor-action target/
12+
cargo build --release --target $TARGET && \
13+
mv target/${TARGET}/release/codeql-extractor-action target/
1414

15-
FROM docker.io/library/debian:12-slim
15+
# We have to use Debian testing as the stable version has an old
16+
# version of `glibc` that doesn't work with new-ist versions of CodeQL.
17+
FROM docker.io/library/debian:testing-slim
1618
WORKDIR /app
1719

1820
COPY --from=builder /app/target/codeql-extractor-action /usr/local/bin/codeql-extractor-action
1921

20-
# Install gh CLI
22+
# Install GitHub CLI
2123
RUN apt-get update && \
22-
apt-get install -y --no-install-recommends curl git ca-certificates && \
24+
apt-get install -y curl git && \
2325
curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
2426
chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg && \
2527
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null && \

0 commit comments

Comments
 (0)