diff --git a/geoportal/Dockerfile b/geoportal/Dockerfile index 741e653d3..8c6cc6596 100644 --- a/geoportal/Dockerfile +++ b/geoportal/Dockerfile @@ -36,7 +36,8 @@ COPY geoportailv3_geoportal/static-ngeo /app/geoportailv3_geoportal/static-ngeo RUN rm -rf /usr/lib/node_modules/ngeo RUN mv /app/geoportailv3_geoportal/static-ngeo/ngeo /usr/lib/node_modules/ngeo -COPY . /app +RUN mkdir -p /app +COPY ./package.json /app # jsapi generation ADD ./jsapi /etc/apiv4/ @@ -45,6 +46,7 @@ RUN node --version RUN npm install --no-optional && npm cache clear --force RUN /etc/apiv4/rebuild_api.sh +COPY . /app WORKDIR /app # sad fix, to allow webpack's file-loader to find files with query string & hash added RUN ln -s /usr/lib/node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.eot /usr/lib/node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.eot?#iefix && \ @@ -52,7 +54,6 @@ RUN ln -s /usr/lib/node_modules/@fortawesome/fontawesome-free/webfonts/fa-regula ln -s /usr/lib/node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.eot /usr/lib/node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.eot?#iefix && \ ln -s /usr/lib/node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.svg /usr/lib/node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.svg#fontawesome - # RUN make checks RUN make build diff --git a/geoportal/package.json b/geoportal/package.json index 57cf0c85b..2177f4b8b 100644 --- a/geoportal/package.json +++ b/geoportal/package.json @@ -14,7 +14,7 @@ "url": "https://github.com/Geoportail-Luxembourg/geoportailv3/issues" }, "devDependencies": { - "luxembourg-geoportail": "https://github.com/Geoportail-Luxembourg/luxembourg-geoportail.git#942bd52874cf2144202ecde81e4a7ee64f0c8dd1", + "luxembourg-geoportail": "https://github.com/Geoportail-Luxembourg/luxembourg-geoportail/releases/download/GSLUX-635_create_release_CI_6606389/luxembourg-geoportail-lib-0.0.0-dev.tgz", "@babel/core": "7.16.0", "@babel/plugin-proposal-class-properties": "7.16.0", "@babel/plugin-proposal-decorators": "7.16.0",