From 505d21c21fd141abeb28d66914ff5408b9e0c5e0 Mon Sep 17 00:00:00 2001 From: Tariq Soliman Date: Mon, 11 Mar 2024 09:16:16 -0700 Subject: [PATCH 1/2] #508 Upgrade to NodeJS v20.11.1 --- Dockerfile | 2 +- README.md | 4 ++-- docs/pages/Setup/Installation/Installation.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 986f5b02..db57f9ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16 +FROM node:20 ARG PUBLIC_URL_ARG= ENV PUBLIC_URL=$PUBLIC_URL_ARG diff --git a/README.md b/README.md index 8d048bba..ce4d6256 100644 --- a/README.md +++ b/README.md @@ -94,12 +94,12 @@ See the [configuration documentation](https://nasa-ammos.github.io/MMGIS/configu ### System Requirements -1. Install the latest version of [Node.js v16.13.2+](https://nodejs.org/en/download/). +1. Install the latest version of [Node.js v20.11.1+](https://nodejs.org/en/download/). 1. Install [PostgreSQL v10.14+](https://www.enterprisedb.com/downloads/postgres-postgresql-downloads). Detailed [install instructions](https://www.postgresqltutorial.com/postgresql-getting-started/) for all platforms. 1. Install [PostGIS 2.5+](https://postgis.net/install/). From the above install, you can use the 'Application Stack Builder' to install PostGIS or the default [PostGIS install instructions](https://postgis.net/install/) for all platforms. 1. Make a new PostgreSQL database and remember the user, password and database name. - Use 'pgsl' or the 'SQL Shell' to log into Postgres. It will prompt you for the username and password made during the install. + Use 'psql' or the 'SQL Shell' to log into Postgres. It will prompt you for the username and password made during the install. 1. GDAL and Python are weaker dependencies (desirable but, without them, not everything will work) diff --git a/docs/pages/Setup/Installation/Installation.md b/docs/pages/Setup/Installation/Installation.md index e806102f..693aead9 100644 --- a/docs/pages/Setup/Installation/Installation.md +++ b/docs/pages/Setup/Installation/Installation.md @@ -69,7 +69,7 @@ See the [configuration documentation](https://nasa-ammos.github.io/MMGIS/configu ### System Requirements -1. Install the latest version of [Node.js v16.13.2+](https://nodejs.org/en/download/). +1. Install the latest version of [Node.js v20.11.1+](https://nodejs.org/en/download/). 1. Install [PostgreSQL v10.14+](https://www.enterprisedb.com/downloads/postgres-postgresql-downloads). Detailed [install instructions](https://www.postgresqltutorial.com/postgresql-getting-started/) for all platforms. 1. Install [PostGIS 2.5+](https://postgis.net/install/). From the above install, you can use the 'Application Stack Builder' to install PostGIS or the default [PostGIS install instructions](https://postgis.net/install/) for all platforms. From 37247531424943354332ac01c10eca3a37edfa3d Mon Sep 17 00:00:00 2001 From: Tariq Soliman Date: Mon, 11 Mar 2024 10:31:07 -0700 Subject: [PATCH 2/2] #508 Update Dockerfile 2, update nupmy --- Dockerfile | 9 +++++---- python-requirements.txt | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index db57f9ac..dd9e29b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,15 +7,16 @@ ENV PUBLIC_URL=$PUBLIC_URL_ARG RUN apt-get -y update RUN apt-get install -y gdal-bin libgdal-dev python3-pip python3-gdal -# Use Python3 for python -RUN rm /usr/bin/python && ln -s /usr/bin/python3 /usr/bin/python - # Create app directory WORKDIR /usr/src/app # Install app dependencies COPY python-requirements.txt ./ -RUN python -m pip install --upgrade pip && python -m pip install -r ./python-requirements.txt +RUN rm /usr/lib/python*/EXTERNALLY-MANAGED && \ + pip3 install -r ./python-requirements.txt + +# Use python3 for python +RUN ln -s /usr/bin/python3 /usr/bin/python COPY package*.json ./ RUN npm install diff --git a/python-requirements.txt b/python-requirements.txt index 247ed0cf..a9ced2c7 100644 --- a/python-requirements.txt +++ b/python-requirements.txt @@ -1,3 +1,3 @@ -numpy==1.21.6 +numpy==1.26.4 spiceypy==5.1.2 pymap3d==3.0.1 \ No newline at end of file