diff --git a/Dockerfile b/Dockerfile index 0338a2d..807570c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ -ARG GOLANG_VERSION="1.20.5" -ARG ALPINE_VERSION="3.18" +ARG GOLANG_VERSION="1.20.11" +ARG DEBIAN_VERSION="bookworm" +ARG YTDLP_VERSION="2023.12.30" -FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} AS build +FROM golang:${GOLANG_VERSION}-${DEBIAN_VERSION} AS build ENV VERSION_PKG="go.fifitido.net/ytdl-web/version" ARG VERSION=latest @@ -25,12 +26,16 @@ RUN go build \ -X \"$VERSION_PKG.BuiltBy=$BUILT_BY\" \ " -o /ytdl-web . -FROM alpine:${ALPINE_VERSION} +FROM debian:${DEBIAN_VERSION} WORKDIR /app -ARG YTDLP_VERSION="2023.07.06-r0" -RUN apk add --no-cache yt-dlp==${YTDLP_VERSION} +# hadolint ignore=DL3008 +RUN apt-get update \ + && apt-get install --no-install-recommends -y wget \ + && wget --progress=dot:giga "https://github.com/yt-dlp/yt-dlp/releases/download/$YTDLP_VERSION/yt-dlp_linux" \ + && install -pm755 yt-dlp_linux /usr/bin/yt-dlp \ + && apt-get clean && rm -rf /var/lib/apt/lists/* COPY --from=build /ytdl-web ./ @@ -41,4 +46,4 @@ ENV YTDL_HTTP_PORT=8080 \ YTDL_BINARYPATH=/usr/bin/yt-dlp \ YTDL_CONFIGDIR=/config -ENTRYPOINT [ "./ytdl-web" ] \ No newline at end of file +ENTRYPOINT [ "./ytdl-web" ] diff --git a/devenv.nix b/devenv.nix index 01f771e..76a629d 100644 --- a/devenv.nix +++ b/devenv.nix @@ -4,7 +4,7 @@ # https://devenv.sh/basics/ env.NAME = "ytdl-web"; env.BINARY_OUT = "./out/ytdl-web"; - env.VERSION = "v1.1.3"; + env.VERSION = "v1.1.4"; env.VERSION_PKG = "go.fifitido.net/ytdl-web/version"; env.DOCKER_REGISTRY = "git.fifitido.net"; env.DOCKER_ORG = "apps";