From 29fd8d1904c891acd80e4500f89952e9325c83d9 Mon Sep 17 00:00:00 2001 From: Moritz Kirmse Date: Tue, 30 Jul 2024 12:47:45 +0200 Subject: [PATCH 1/4] reference released bundle in v4 repo --- geoportal/Dockerfile | 10 ++++++++-- geoportal/v4_release.txt | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 geoportal/v4_release.txt diff --git a/geoportal/Dockerfile b/geoportal/Dockerfile index 741e653d3..a49f97978 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,10 +54,14 @@ 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 +RUN curl -L https://github.com/Geoportail-Luxembourg/luxembourg-geoportail/releases/download/$(cat v4_release.txt)/bundle.tgz > /tmp/bundle.tgz && \ + tar -xzvf /tmp/bundle.tgz -C /tmp && \ + mkdir -p /usr/lib/node_modules/luxembourg-geoportail && \ + mv /tmp/bundle/ /usr/lib/node_modules/luxembourg-geoportail + RUN make apps RUN mv webpack.apps.js webpack.apps.js.tmpl # copy web component styles and translations from bundle to static-ngeo diff --git a/geoportal/v4_release.txt b/geoportal/v4_release.txt new file mode 100644 index 000000000..7872695ca --- /dev/null +++ b/geoportal/v4_release.txt @@ -0,0 +1 @@ +GSLUX-635_5278bb4fbd7496cbb092087899d106256e3154a0 From 21135b0f7c76571eadab5116a5b71cd5d0ef23ab Mon Sep 17 00:00:00 2001 From: Moritz Kirmse Date: Tue, 30 Jul 2024 16:56:06 +0200 Subject: [PATCH 2/4] install cleanly via npm --- geoportal/Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/geoportal/Dockerfile b/geoportal/Dockerfile index a49f97978..45697d527 100644 --- a/geoportal/Dockerfile +++ b/geoportal/Dockerfile @@ -57,10 +57,7 @@ RUN ln -s /usr/lib/node_modules/@fortawesome/fontawesome-free/webfonts/fa-regula # RUN make checks RUN make build -RUN curl -L https://github.com/Geoportail-Luxembourg/luxembourg-geoportail/releases/download/$(cat v4_release.txt)/bundle.tgz > /tmp/bundle.tgz && \ - tar -xzvf /tmp/bundle.tgz -C /tmp && \ - mkdir -p /usr/lib/node_modules/luxembourg-geoportail && \ - mv /tmp/bundle/ /usr/lib/node_modules/luxembourg-geoportail +RUN npm install --global https://github.com/Geoportail-Luxembourg/luxembourg-geoportail/releases/download/$(cat v4_release.txt)/luxembourg-geoportail-0.0.0-dev.tar.gz RUN make apps RUN mv webpack.apps.js webpack.apps.js.tmpl From fbc3f6c7b7db7f4b8649b3f501afc5bd5024b835 Mon Sep 17 00:00:00 2001 From: Moritz Kirmse Date: Tue, 30 Jul 2024 16:58:25 +0200 Subject: [PATCH 3/4] update release reference to the bundle --- geoportal/v4_release.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geoportal/v4_release.txt b/geoportal/v4_release.txt index 7872695ca..e748ded9e 100644 --- a/geoportal/v4_release.txt +++ b/geoportal/v4_release.txt @@ -1 +1 @@ -GSLUX-635_5278bb4fbd7496cbb092087899d106256e3154a0 +GSLUX-635_5eef06fbd2b691b10bc67715bf194fbb13be5512 From 283e3dc4b1ed8e681be0629c9db17627ae0e962f Mon Sep 17 00:00:00 2001 From: Moritz Kirmse Date: Thu, 1 Aug 2024 12:02:54 +0200 Subject: [PATCH 4/4] use release url in package.json --- geoportal/Dockerfile | 2 -- geoportal/package.json | 2 +- geoportal/v4_release.txt | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 geoportal/v4_release.txt diff --git a/geoportal/Dockerfile b/geoportal/Dockerfile index 45697d527..8c6cc6596 100644 --- a/geoportal/Dockerfile +++ b/geoportal/Dockerfile @@ -57,8 +57,6 @@ RUN ln -s /usr/lib/node_modules/@fortawesome/fontawesome-free/webfonts/fa-regula # RUN make checks RUN make build -RUN npm install --global https://github.com/Geoportail-Luxembourg/luxembourg-geoportail/releases/download/$(cat v4_release.txt)/luxembourg-geoportail-0.0.0-dev.tar.gz - RUN make apps RUN mv webpack.apps.js webpack.apps.js.tmpl # copy web component styles and translations from bundle to static-ngeo 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", diff --git a/geoportal/v4_release.txt b/geoportal/v4_release.txt deleted file mode 100644 index e748ded9e..000000000 --- a/geoportal/v4_release.txt +++ /dev/null @@ -1 +0,0 @@ -GSLUX-635_5eef06fbd2b691b10bc67715bf194fbb13be5512