Skip to content

Commit 6e51a6c

Browse files
committed
Switch from Alpine+Musl to Debian Buster
1 parent 11c4596 commit 6e51a6c

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

.github/dependabot.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,8 @@ updates:
1010
directory: "/"
1111
schedule:
1212
interval: "daily"
13+
14+
- package-ecosystem: "docker"
15+
directory: "/"
16+
schedule:
17+
interval: "daily"

Dockerfile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Cross-compile the app for musl to create a statically-linked binary for alpine.
2-
FROM clux/muslrust:1.43.1-stable AS rust
2+
FROM rust:1.50 AS rust
33
RUN rustup component add clippy rustfmt
44
WORKDIR /app
55
COPY Cargo.toml Cargo.lock .rustfmt.toml ./
@@ -21,7 +21,9 @@ RUN find . -type f | xargs shellcheck -e SC1008
2121
RUN shfmt -d .
2222

2323

24-
FROM oznu/s6-alpine:3.11
24+
FROM debian:buster-slim
25+
ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.1/s6-overlay-amd64-installer /tmp/
26+
RUN chmod +x /tmp/s6-overlay-amd64-installer && /tmp/s6-overlay-amd64-installer /
2527
ENV \
2628
# Fail if cont-init scripts exit with non-zero code.
2729
S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
@@ -33,9 +35,11 @@ ENV \
3335
PUID="" \
3436
PGID="" \
3537
GITOUT_ARGS=""
36-
RUN apk update && \
37-
apk add ca-certificates curl && \
38-
rm -rf /var/cache/apk/*
38+
RUN apt-get update && \
39+
apt-get install -y --no-install-recommends \
40+
curl \
41+
&& \
42+
rm -rf /var/lib/apt/lists/*
3943
COPY root/ /
4044
WORKDIR /app
41-
COPY --from=rust /app/target/x86_64-unknown-linux-musl/release/gitout ./
45+
COPY --from=rust /app/target/release/gitout ./

0 commit comments

Comments
 (0)