Skip to content
Snippets Groups Projects
Unverified Commit 2a11ca13 authored by Junoh Moon's avatar Junoh Moon Committed by GitHub
Browse files

Add mime.types to docker container to select charset properly (#547)

* Add charset to content type in getHandler

Add charset to content type in the getHandler function to fix CJK-letter related issues.
If the content type is empty after trimming, set it to "text/plain; charset=utf-8".

* Add mailcap and mime.types to transfer.sh container

This commit includes /etc/mime.types file to the container, which is necessary to properly select the charset using MIME typing during file upload.

For more information, read https://github.com/dutchcoders/transfer.sh/pull/545#issuecomment-1528712181



---------

Co-authored-by: default avatarAndrea Spacca <andrea.spacca@gmail.com>
parent 1e6346c3
Branches
Tags
No related merge requests found
...@@ -3,7 +3,7 @@ ARG GO_VERSION=1.20 ...@@ -3,7 +3,7 @@ ARG GO_VERSION=1.20
FROM golang:${GO_VERSION}-alpine as build FROM golang:${GO_VERSION}-alpine as build
# Necessary to run 'go get' and to compile the linked binary # Necessary to run 'go get' and to compile the linked binary
RUN apk add git musl-dev RUN apk add git musl-dev mailcap
ADD . /go/src/github.com/dutchcoders/transfer.sh ADD . /go/src/github.com/dutchcoders/transfer.sh
...@@ -29,6 +29,7 @@ FROM scratch AS final ...@@ -29,6 +29,7 @@ FROM scratch AS final
LABEL maintainer="Andrea Spacca <andrea.spacca@gmail.com>" LABEL maintainer="Andrea Spacca <andrea.spacca@gmail.com>"
ARG RUNAS ARG RUNAS
COPY --from=build /etc/mime.types /etc/mime.types
COPY --from=build /tmp/empty /tmp COPY --from=build /tmp/empty /tmp
COPY --from=build /tmp/useradd/* /etc/ COPY --from=build /tmp/useradd/* /etc/
COPY --from=build --chown=${RUNAS} /go/bin/transfersh /go/bin/transfersh COPY --from=build --chown=${RUNAS} /go/bin/transfersh /go/bin/transfersh
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment