Compare commits

...

4 commits

Author SHA1 Message Date
Philip Peterson
ff38d4fb1e Merge remote-tracking branch 'q/master'
Some checks failed
CI / ci (push) Has been cancelled
Desktop Release / Build desktop (x86_64-apple-darwin) (push) Has been cancelled
Desktop Release / Build desktop (aarch64-apple-darwin) (push) Has been cancelled
Desktop Release / Build desktop (x86_64-pc-windows-msvc) (push) Has been cancelled
Desktop Release / Publish Gitea release (push) Has been cancelled
2026-08-25 17:23:32 -08:00
Philip Peterson
ca2c052522 Use Docker Hub base images instead of AWS ECR mirror
public.ecr.aws returns 429 Too Many Requests; the docker/library/*
images are just Docker Hub official images mirrored on ECR.
2026-08-25 17:22:34 -08:00
Philip Peterson
f30bc188b9 Fix 2026-08-25 15:16:10 -08:00
Philip Peterson
dcba580ba7 Fix 2026-08-25 15:08:32 -08:00
2 changed files with 9 additions and 6 deletions

View file

@ -120,7 +120,10 @@ func (m *Quintodrome) TestJS(ctx context.Context, src *dagger.Directory) error {
} }
func goContainer() *dagger.Container { func goContainer() *dagger.Container {
return dag.Container().From("golang:1.26") return dag.Container().
From("golang:1.26").
WithExec([]string{"apt-get", "update"}).
WithExec([]string{"apt-get", "install", "-y", "zip"})
} }
func jsContainer() *dagger.Container { func jsContainer() *dagger.Container {

View file

@ -2,7 +2,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/crazy-max/osxcross:14.5-debian AS osxcros
######################################################################################################################## ########################################################################################################################
### Build xx (original image: tonistiigi/xx) ### Build xx (original image: tonistiigi/xx)
FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/alpine:3.20 AS xx-build FROM --platform=$BUILDPLATFORM docker.io/library/alpine:3.20 AS xx-build
# v1.9.0 # v1.9.0
ENV XX_VERSION=a5592eab7a57895e8d385394ff12241bc65ecd50 ENV XX_VERSION=a5592eab7a57895e8d385394ff12241bc65ecd50
@ -26,7 +26,7 @@ COPY --from=xx-build /out/ /usr/bin/
######################################################################################################################## ########################################################################################################################
### Build Navidrome UI ### Build Navidrome UI
FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/node:lts-alpine AS ui FROM --platform=$BUILDPLATFORM docker.io/library/node:lts-alpine AS ui
WORKDIR /app WORKDIR /app
# Install node dependencies # Install node dependencies
@ -43,7 +43,7 @@ COPY --from=ui /build /build
######################################################################################################################## ########################################################################################################################
### Build Navidrome binary for Docker image (dynamic musl, enables native libwebp via dlopen) ### Build Navidrome binary for Docker image (dynamic musl, enables native libwebp via dlopen)
FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/golang:1.26-alpine AS build-alpine FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.26-alpine AS build-alpine
COPY --from=xx / / COPY --from=xx / /
ARG TARGETPLATFORM ARG TARGETPLATFORM
@ -82,7 +82,7 @@ EOT
######################################################################################################################## ########################################################################################################################
### Build Navidrome binary for standalone distribution (static glibc, cross-compiled) ### Build Navidrome binary for standalone distribution (static glibc, cross-compiled)
FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/golang:1.26-trixie AS base FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.26-trixie AS base
RUN apt-get update && apt-get install -y clang lld RUN apt-get update && apt-get install -y clang lld
COPY --from=xx / / COPY --from=xx / /
WORKDIR /workspace WORKDIR /workspace
@ -139,7 +139,7 @@ COPY --from=build /out /
######################################################################################################################## ########################################################################################################################
### Build Final Image ### Build Final Image
FROM public.ecr.aws/docker/library/alpine:3.20 AS final FROM docker.io/library/alpine:3.20 AS final
LABEL maintainer="deluan@navidrome.org" LABEL maintainer="deluan@navidrome.org"
LABEL org.opencontainers.image.source="https://github.com/navidrome/navidrome" LABEL org.opencontainers.image.source="https://github.com/navidrome/navidrome"