mirror of
https://github.com/fosrl/pangolin.git
synced 2026-10-21 20:19:07 +02:00
Dont delete maxmind
This commit is contained in:
+3
-6
@@ -55,17 +55,14 @@ COPY server/db/ios_models.json ./dist/ios_models.json
|
|||||||
COPY server/db/mac_models.json ./dist/mac_models.json
|
COPY server/db/mac_models.json ./dist/mac_models.json
|
||||||
COPY public ./public
|
COPY public ./public
|
||||||
|
|
||||||
# Copy MaxMind databases for SaaS builds
|
|
||||||
ARG BUILD=oss
|
|
||||||
|
|
||||||
RUN mkdir -p ./maxmind
|
RUN mkdir -p ./maxmind
|
||||||
|
|
||||||
# Copy MaxMind databases (placeholders exist for oss builds, real files for saas)
|
# 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-Country.mmdb ./maxmind/GeoLite2-Country.mmdb
|
||||||
COPY --from=builder-dev /app/GeoLite2-ASN.mmdb ./maxmind/GeoLite2-ASN.mmdb
|
COPY --from=builder-dev /app/GeoLite2-ASN.mmdb ./maxmind/GeoLite2-ASN.mmdb
|
||||||
|
|
||||||
# Remove MaxMind databases for non-saas builds (keep only for saas)
|
# Remove empty placeholder MaxMind databases (and the directory if nothing real is left)
|
||||||
RUN if [ "$BUILD" != "saas" ]; then rm -rf ./maxmind; fi
|
RUN find ./maxmind -empty -delete
|
||||||
|
|
||||||
# OCI Image Labels - Build Args for dynamic values
|
# OCI Image Labels - Build Args for dynamic values
|
||||||
ARG VERSION="dev"
|
ARG VERSION="dev"
|
||||||
|
|||||||
@@ -101,7 +101,6 @@ build-saas:
|
|||||||
--platform linux/arm64 \
|
--platform linux/arm64 \
|
||||||
--tag $(AWS_IMAGE):$(tag) \
|
--tag $(AWS_IMAGE):$(tag) \
|
||||||
--push .
|
--push .
|
||||||
|
|
||||||
docker buildx build \
|
docker buildx build \
|
||||||
--build-arg BUILD=enterprise \
|
--build-arg BUILD=enterprise \
|
||||||
--build-arg DATABASE=pg \
|
--build-arg DATABASE=pg \
|
||||||
|
|||||||
Reference in New Issue
Block a user