Skip to content

Commit 6dfe95c

Browse files
author
Max Dymond
authored
Merge pull request #299 from Metaswitch/md/rustalpine
Replace rust-musl-builder with more up-to-date builder
2 parents 9f04ec5 + 9a73940 commit 6dfe95c

7 files changed

Lines changed: 168 additions & 66 deletions

File tree

.devcontainer/Dockerfile.alpine

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM rust:1-alpine3.18
2+
3+
ENV CARGO_BUILD_TARGET=x86_64-unknown-linux-musl
4+
5+
RUN apk update && \
6+
apk add bash musl-dev shadow && \
7+
# Add a user for floki using the shadow utils
8+
useradd -Um -s /bin/bash floki

.devcontainer/devcontainer.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"name": "floki",
3+
"build": { "dockerfile": "Dockerfile.alpine" },
4+
"remoteUser": "floki"
5+
}

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Status: Available for use
2121
- Add `toml` function to tera templating engine so that floki templates
2222
can use `toml(file="<filepath>")` in order to load values.
2323
- Add `floki render` to print out the rendered configuration template.
24+
- Switch rust image to `rust:1-alpine3.18` as it's better maintained.
2425

2526
### Fixed
2627

0 commit comments

Comments
 (0)