Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use node 16 #44

Merged
merged 4 commits into from
Aug 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,15 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [3.14.0](https://github.com/eea/industry-frontend/compare/3.13.0...3.14.0)

- Use node 16 [`a07081f`](https://github.com/eea/industry-frontend/commit/a07081f0d97882e597a347d4cc640108896c463e)

#### [3.13.0](https://github.com/eea/industry-frontend/compare/3.12.0...3.13.0)

> 22 August 2022

- Use latest volto [`#43`](https://github.com/eea/industry-frontend/pull/43)
- Release @eeacms/volto-industry-theme@2.0.5 [`9793654`](https://github.com/eea/industry-frontend/commit/97936542e123ab2bd768d3b21b466160e14c2e3c)
- Merge master into develop [`3f399f0`](https://github.com/eea/industry-frontend/commit/3f399f0de5789d1a00d0127160b5b4cd92027e5d)
- Update addons + use volto 16 [`07d02d2`](https://github.com/eea/industry-frontend/commit/07d02d2125681498c4da455d27590bd4843ce301)
Expand Down
26 changes: 13 additions & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
# Based on https://github.com/plone/volto/blob/master/entrypoint.sh
FROM node:12-stretch-slim
FROM node:16-slim

COPY . /opt/frontend/
WORKDIR /opt/frontend/

# Update apt packages
RUN runDeps="openssl ca-certificates patch git" \
&& apt-get update \
&& apt-get install -y --no-install-recommends $runDeps \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& chown -R node /opt/frontend/ \
&& cp jsconfig.json.prod jsconfig.json \
&& mkdir -p /opt/frontend/src/addons \
&& rm -rf /opt/frontend/src/addons/* \
&& npm install -g mrs-developer
&& apt-get update \
&& apt-get install -y --no-install-recommends $runDeps \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& chown -R node /opt/frontend/ \
&& cp jsconfig.json.prod jsconfig.json \
&& mkdir -p /opt/frontend/src/addons \
&& rm -rf /opt/frontend/src/addons/* \
&& npm install -g mrs-developer

USER node

ARG MAX_OLD_SPACE_SIZE=8192
ENV NODE_OPTIONS=--max_old_space_size=$MAX_OLD_SPACE_SIZE

RUN cd /opt/frontend \
&& RAZZLE_API_PATH=VOLTO_API_PATH RAZZLE_INTERNAL_API_PATH=VOLTO_INTERNAL_API_PATH yarn \
&& RAZZLE_API_PATH=VOLTO_API_PATH RAZZLE_INTERNAL_API_PATH=VOLTO_INTERNAL_API_PATH yarn build \
&& rm -rf /home/node/.cache
&& RAZZLE_API_PATH=VOLTO_API_PATH RAZZLE_INTERNAL_API_PATH=VOLTO_INTERNAL_API_PATH yarn \
&& RAZZLE_API_PATH=VOLTO_API_PATH RAZZLE_INTERNAL_API_PATH=VOLTO_INTERNAL_API_PATH yarn build \
&& rm -rf /home/node/.cache

EXPOSE 3000 3001 4000 4001

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Release](https://img.shields.io/github/v/release/eea/industry-frontend?sort=semver)](https://github.com/eea/industry-frontend/releases)
[![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Findustry-frontend%2Fmaster&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto/job/industry-frontend/job/master/lastBuild/display/redirect)
[![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Findustry-frontend%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto/job/industry-frontend/job/develop/lastBuild/display/redirect)
[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Findustry-frontend%2F3.13.0&build=last&subject=release%20v3.13.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/industry-frontend/job/3.13.0/lastBuild/display/redirect/)
[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Findustry-frontend%2F3.14.0&build=last&subject=release%20v3.14.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/industry-frontend/job/3.14.0/lastBuild/display/redirect/)


## Documentation
Expand Down
9 changes: 1 addition & 8 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
{
"compilerOptions": {
"paths": {
"@eeacms/volto-industry-theme": [
"addons/volto-industry-theme/src"
],
"@eeacms/volto-datablocks": [
"addons/volto-datablocks/src"
]
},
"paths": {},
"baseUrl": "src"
}
}
4 changes: 2 additions & 2 deletions mrs.developer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"package": "@eeacms/volto-industry-theme",
"branch": "develop",
"path": "src",
"develop": true
"develop": false
},
"volto-datablocks": {
"url": "git@github.com:eea/volto-datablocks.git",
"https": "https://github.com/eea/volto-datablocks.git",
"package": "@eeacms/volto-datablocks",
"branch": "develop",
"path": "src",
"develop": true
"develop": false
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@eeacms/industry-frontend",
"description": "Volto-based frontend server and SPA for the Industrial Emissions Portal website (former EPRTR) industry.eea.europa.eu",
"license": "MIT",
"version": "3.13.0",
"version": "3.14.0",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
"homepage": "https://github.com/eea/industry-frontend",
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1392,9 +1392,9 @@
integrity sha512-ScJuVsF51efiiHfv3nPuVoocHN9YpTUA2Jjsb193NFjtxMY1WH9fcAVlZt12Nau/5dqQRLPCl5VtVyxWvOwxsg==

"@eeacms/volto-datablocks@*":
version "3.0.15"
resolved "https://registry.yarnpkg.com/@eeacms/volto-datablocks/-/volto-datablocks-3.0.15.tgz#b638ea49107cafec748d44637a1df98e31b43050"
integrity sha512-nLl2WqJzgt3LR7NcCE3NXCBUoBeLOKtATe4Gugv+B71IpXMaqfZ1j3wvVHr80ocGBMnb4hqL3FcQGio5KRLeyA==
version "3.0.16"
resolved "https://registry.yarnpkg.com/@eeacms/volto-datablocks/-/volto-datablocks-3.0.16.tgz#c9e2261381e3423b843d3ce76b33e5a061f8a93e"
integrity sha512-3QoNFK3ErWv1bQVkWYH3pEgGrNvLEHwbIrylH5t2740rfpi681SDksnajMiEFTY6nBZCL8UF5wFNpROXgyFxag==
dependencies:
"@eeacms/volto-embed" "*"
"@eeacms/volto-group-block" "*"
Expand Down