From 5418a6b6b14edc5a83b945a5d02ece68e526ea83 Mon Sep 17 00:00:00 2001 From: Deluan Date: Thu, 9 Jul 2020 00:45:04 -0400 Subject: [PATCH] Remove unused docker files --- .gitignore | 2 +- Dockerfile | 66 ---------------------------------------------- docker-compose.yml | 21 --------------- 3 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 Dockerfile delete mode 100644 docker-compose.yml diff --git a/.gitignore b/.gitignore index 5a5846b9..a6469fac 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,7 @@ navidrome.db embedded_gen.go dist music -docker-compose.override.yml +docker-compose.yml navidrome.db-shm navidrome.db-wal tags diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 35e4d488..00000000 --- a/Dockerfile +++ /dev/null @@ -1,66 +0,0 @@ -##################################################### -### Build UI bundles -FROM node:14-alpine AS jsbuilder -WORKDIR /src -COPY ui/package.json ui/package-lock.json ./ -RUN npm ci -COPY ui/ . -RUN npm run build - - -##################################################### -### Build executable -FROM golang:1.14-alpine AS gobuilder - -# Download build tools -RUN mkdir -p /src/ui/build -RUN apk add -U --no-cache build-base git -RUN go get -u github.com/go-bindata/go-bindata/... - -# Download project dependencies -WORKDIR /src -COPY go.mod go.sum ./ -RUN go mod download - -# Copy source, test it -COPY . . -RUN go test ./... - -# Copy UI bundle, build executable -COPY --from=jsbuilder /src/build/* /src/ui/build/ -COPY --from=jsbuilder /src/build/static/css/* /src/ui/build/static/css/ -COPY --from=jsbuilder /src/build/static/js/* /src/ui/build/static/js/ -RUN rm -rf /src/build/css /src/build/js -RUN GIT_TAG=$(git describe --tags `git rev-list --tags --max-count=1`) && \ - GIT_TAG=${GIT_TAG#"tags/"} && \ - GIT_SHA=$(git rev-parse --short HEAD) && \ - echo "Building version: ${GIT_TAG} (${GIT_SHA})" && \ - go-bindata -fs -prefix resources -tags embed -ignore="\\\*.go" -pkg resources -o resources/embedded_gen.go resources/... - go-bindata -fs -prefix ui/build -tags embed -nocompress -pkg assets -o assets/embedded_gen.go ui/build/... && \ - go build -ldflags="-X github.com/deluan/navidrome/consts.gitSha=${GIT_SHA} -X github.com/deluan/navidrome/consts.gitTag=${GIT_TAG}" -tags=embed - -##################################################### -### Build Final Image -FROM alpine as release -LABEL maintainer="deluan@navidrome.org" - -COPY --from=gobuilder /src/navidrome /app/ - -# Install ffmpeg and output build config -RUN apk add --no-cache ffmpeg -RUN ffmpeg -buildconf - -VOLUME ["/data", "/music"] -ENV ND_MUSICFOLDER /music -ENV ND_DATAFOLDER /data -ENV ND_SCANINTERVAL 1m -ENV ND_TRANSCODINGCACHESIZE 100MB -ENV ND_SESSIONTIMEOUT 30m -ENV ND_LOGLEVEL info -ENV ND_PORT 4533 - -EXPOSE ${ND_PORT} -HEALTHCHECK CMD wget -O- http://localhost:${ND_PORT}/ping || exit 1 -WORKDIR /app - -ENTRYPOINT ["/app/navidrome"] diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 1235e7e4..00000000 --- a/docker-compose.yml +++ /dev/null @@ -1,21 +0,0 @@ -# This is just an example. Customize it to your needs. - -version: "3" -services: - navidrome: - image: deluan/navidrome:latest - ports: - - "4533:4533" - environment: - # All options with their default values: - ND_MUSICFOLDER: /music - ND_DATAFOLDER: /data - ND_SCANINTERVAL: 1m - ND_LOGLEVEL: info - ND_PORT: 4533 - ND_TRANSCODINGCACHESIZE: 100MB - ND_SESSIONTIMEOUT: 30m - ND_BASEURL: "" - volumes: - - "./data:/data" - - "./music:/music"