Merge branch 'main' into dev

This commit is contained in:
Owen
2026-10-19 11:04:49 -04:00
15 changed files with 883 additions and 205 deletions
+6 -4
View File
@@ -58,12 +58,14 @@ COPY server/db/ios_models.json ./dist/ios_models.json
COPY server/db/mac_models.json ./dist/mac_models.json
COPY public ./public
# Copy MaxMind databases (empty directory for non-saas builds)
ARG BUILD=oss
RUN mkdir -p ./maxmind
COPY --from=builder-dev /app/maxmind ./maxmind
# Copy MaxMind databases (empty placeholders unless real files were in the build context)
COPY --from=builder-dev /app/GeoLite2-Country.mmdb ./maxmind/GeoLite2-Country.mmdb
COPY --from=builder-dev /app/GeoLite2-ASN.mmdb ./maxmind/GeoLite2-ASN.mmdb
RUN if [ "$BUILD" != "saas" ]; then rmdir ./maxmind; fi
# Remove empty placeholder MaxMind databases (and the directory if nothing real is left)
RUN find ./maxmind -empty -delete
# OCI Image Labels - Build Args for dynamic values
ARG VERSION="dev"