Merge pull request #2137 from scpwiki/dependabot/cargo/deepwell/filem…

…agic-0.13.1

Bump filemagic from 0.12.3 to 0.13.1 in /deepwell

deepwell/Cargo.toml

@@ -29,7 +29,7 @@ data-encoding = "2"
 dotenvy = "0.15"
 either = "1"
 femme = "2"
-filemagic = "0.12"
+filemagic = "0.13"
 fluent = "0.16"
 fluent-syntax = "0"
 ftml = { version = "1.27", features = ["mathml"] }

install/aws/prod/docker/api/Dockerfile

@@ -2,11 +2,11 @@
 # DEEPWELL build
 #
 
-FROM rust:alpine AS rust
+FROM rust:latest AS rust
 
 # Install system dependencies
-RUN apk update
-RUN apk add --no-cache build-base libmagic-static file
+RUN apt update
+RUN apt install -y build-essential libmagic-dev pkg-config
 
 # Copy source
 RUN mkdir /src
@@ -23,12 +23,12 @@ RUN cargo build --release
 # Final image
 #
 
-FROM alpine:latest
+FROM debian:latest
 
 ENV LOCALIZATION_PATH="/opt/locales"
 
-RUN apk update
-RUN apk add --no-cache curl
+RUN apt update
+RUN apt install -y curl libmagic-mgc
 COPY --from=rust /src/deepwell/target/release/deepwell /usr/local/bin/deepwell
 COPY ./install/files/api/health-check.sh /bin/wikijump-health-check
 COPY ./install/files/prod/deepwell.toml /etc/deepwell.toml

install/dev/digitalocean/api/Dockerfile

@@ -2,11 +2,11 @@
 # DEEPWELL build
 #
 
-FROM rust:alpine AS rust
+FROM rust:latest AS rust
 
 # Install system dependencies
-RUN apk update
-RUN apk add --no-cache build-base libmagic-static file
+RUN apt update
+RUN apt install -y build-essential libmagic-dev pkg-config
 
 # Install helpers
 RUN cargo install sqlx-cli --no-default-features --features rustls,postgres
@@ -26,14 +26,14 @@ RUN cargo build --release
 # Final image
 #
 
-FROM alpine:latest
+FROM debian:latest
 
 ENV LOCALIZATION_PATH="/opt/locales"
 
 # Install system dependencies
 RUN mkdir /opt/database
-RUN apk update
-RUN apk add --no-cache curl libmagic-static file postgresql-client
+RUN apt update
+RUN apt install -y curl libmagic-mgc postgresql-client
 
 # Install files
 COPY --from=rust /usr/local/cargo/bin/sqlx /usr/local/cargo/bin/sqlx