diff --git a/.goreleaser.yml b/.goreleaser.yml index b8d20e0..4409527 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -16,7 +16,7 @@ builds: flags: - -tags={{ .Env.JFA_GO_TAG }} ldflags: - - -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater=binary {{.Env.JFA_GO_STRIP}} -X main.cssVersion={{.Env.JFA_GO_CSS_VERSION}} -X main.buildTimeUnix={{.Env.JFA_GO_BUILD_TIME}} -X main.builtBy="{{.Env.JFA_GO_BUILT_BY}}" + - -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater={{.Env.JFA_GO_UPDATER}} {{.Env.JFA_GO_STRIP}} -X main.cssVersion={{.Env.JFA_GO_CSS_VERSION}} -X main.buildTimeUnix={{.Env.JFA_GO_BUILD_TIME}} -X main.builtBy="{{.Env.JFA_GO_BUILT_BY}}" goos: - darwin - windows @@ -35,7 +35,7 @@ builds: flags: - -tags=e2ee,{{ .Env.JFA_GO_TAG }} ldflags: - - -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater=binary {{.Env.JFA_GO_STRIP}} -X main.cssVersion={{.Env.JFA_GO_CSS_VERSION}} -X main.buildTimeUnix={{.Env.JFA_GO_BUILD_TIME}} -X main.builtBy="{{.Env.JFA_GO_BUILT_BY}}" + - -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater={{.Env.JFA_GO_UPDATER}} {{.Env.JFA_GO_STRIP}} -X main.cssVersion={{.Env.JFA_GO_CSS_VERSION}} -X main.buildTimeUnix={{.Env.JFA_GO_BUILD_TIME}} -X main.builtBy="{{.Env.JFA_GO_BUILT_BY}}" goos: - linux goarch: @@ -51,7 +51,7 @@ builds: flags: - -tags=tray,{{ .Env.JFA_GO_TAG }} ldflags: - - -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater=binary {{.Env.JFA_GO_STRIP}} -X main.cssVersion={{.Env.JFA_GO_CSS_VERSION}} -X main.buildTimeUnix={{.Env.JFA_GO_BUILD_TIME}} -X main.builtBy="{{.Env.JFA_GO_BUILT_BY}}" -H=windowsgui + - -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater={{.Env.JFA_GO_UPDATER}} {{.Env.JFA_GO_STRIP}} -X main.cssVersion={{.Env.JFA_GO_CSS_VERSION}} -X main.buildTimeUnix={{.Env.JFA_GO_BUILD_TIME}} -X main.builtBy="{{.Env.JFA_GO_BUILT_BY}}" -H=windowsgui goos: - windows goarch: @@ -66,7 +66,7 @@ builds: flags: - -tags=tray,e2ee,{{ .Env.JFA_GO_TAG }} ldflags: - - -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater=binary {{.Env.JFA_GO_STRIP}} -X main.cssVersion={{.Env.JFA_GO_CSS_VERSION}} -X main.buildTimeUnix={{.Env.JFA_GO_BUILD_TIME}} -X main.builtBy="{{.Env.JFA_GO_BUILT_BY}}" + - -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater={{.Env.JFA_GO_UPDATER}} {{.Env.JFA_GO_STRIP}} -X main.cssVersion={{.Env.JFA_GO_CSS_VERSION}} -X main.buildTimeUnix={{.Env.JFA_GO_BUILD_TIME}} -X main.builtBy="{{.Env.JFA_GO_BUILT_BY}}" goos: - linux goarch: diff --git a/Dockerfile b/Dockerfile index e38329d..a013a39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV JFA_GO_BUILT_BY=$BUILT_BY COPY . /opt/build # RUN curl -sfL https://goreleaser.com/static/run > /goreleaser && chmod +x /goreleaser -RUN cd /opt/build; INTERNAL=off ./scripts/version.sh /goreleaser build --snapshot --skip=validate --clean --id notray-e2ee +RUN cd /opt/build; INTERNAL=off UPDATER=docker ./scripts/version.sh /goreleaser build --snapshot --skip=validate --clean --id notray-e2ee RUN mv /opt/build/dist/*_linux_arm_6 /opt/build/dist/placeholder_linux_arm RUN sed -i 's#id="password_resets-watch_directory" placeholder="/config/jellyfin"#id="password_resets-watch_directory" value="/jf" disabled#g' /opt/build/build/data/html/setup.html diff --git a/scripts/version.sh b/scripts/version.sh index b76100e..ba66a14 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -24,6 +24,13 @@ else export JFA_GO_TAG="external" fi +if [[ -z "${UPDATER}" ]]; then + export UPDATER=on + export JFA_GO_UPDATER=binary +else + export JFA_GO_UPDATER=$UPDATER +fi + JFA_GO_VERSION=$(git describe --exact-match HEAD 2> /dev/null || echo 'vgit') TIMEOUT=60m