From b8b98734eb421ffed30820ebb3dc6a0b091e4774 Mon Sep 17 00:00:00 2001 From: jacquesfize Date: Tue, 29 Oct 2024 14:59:46 +0100 Subject: [PATCH] feat(import): remove gn_module_import in the build --- .gitmodules | 3 --- build/Dockerfile-geonature-backend | 6 ------ build/Dockerfile-geonature-frontend | 5 ----- sources/gn_module_import | 1 - 4 files changed, 15 deletions(-) delete mode 160000 sources/gn_module_import diff --git a/.gitmodules b/.gitmodules index 1b74a71..30a5435 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,9 +13,6 @@ [submodule "gn_module_export"] path = sources/gn_module_export url = https://github.com/PnX-SI/gn_module_export.git -[submodule "gn_module_import"] - path = sources/gn_module_import - url = https://github.com/PnX-SI/gn_module_import.git [submodule "gn_module_dashboard"] path = sources/gn_module_dashboard url = https://github.com/PnX-SI/gn_module_dashboard.git diff --git a/build/Dockerfile-geonature-backend b/build/Dockerfile-geonature-backend index 0151723..1a48061 100644 --- a/build/Dockerfile-geonature-backend +++ b/build/Dockerfile-geonature-backend @@ -7,11 +7,6 @@ RUN --mount=type=cache,target=/root/.cache \ pip install --upgrade pip setuptools wheel -FROM build AS build-import -WORKDIR /build/ -COPY ./sources/gn_module_import . -RUN python setup.py bdist_wheel - FROM build AS build-export WORKDIR /build/ COPY ./sources/gn_module_export . @@ -33,7 +28,6 @@ WORKDIR /dist/geonature RUN --mount=type=cache,target=/var/cache/apt \ --mount=type=cache,target=/var/lib/apt \ apt-get update && apt-get install -y libproj-dev proj-bin -COPY --from=build-import /build/dist/*.whl . COPY --from=build-export /build/dist/*.whl . COPY --from=build-dashboard /build/dist/*.whl . COPY --from=build-monitoring /build/dist/*.whl . diff --git a/build/Dockerfile-geonature-frontend b/build/Dockerfile-geonature-frontend index 937b134..6c15559 100644 --- a/build/Dockerfile-geonature-frontend +++ b/build/Dockerfile-geonature-frontend @@ -3,11 +3,6 @@ ARG GEONATURE_FRONTEND_IMAGE FROM ${GEONATURE_FRONTEND_IMAGE}-source AS source-extra -WORKDIR /build/external_modules/import -COPY ./sources/gn_module_import/frontend/ . -RUN --mount=type=cache,target=/root/.npm \ - npm ci --omit=dev --omit=peer - WORKDIR /build/external_modules/exports COPY ./sources/gn_module_export/frontend/ . RUN --mount=type=cache,target=/root/.npm \ diff --git a/sources/gn_module_import b/sources/gn_module_import deleted file mode 160000 index b850d80..0000000 --- a/sources/gn_module_import +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b850d804242752597ca20149ff90841f445a5bcc