Skip to content
New issue

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

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

Already on GitHub? # to your account

Upgrades to node & base images for node and python #357

Merged
merged 3 commits into from
May 4, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/backendfrontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ jobs:
- name: Install postgresql conda packages
run: conda install -y -c conda-forge postgresql=14.*

- name: Use Node.js v14
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '14'
node-version: '18'

- name: Install npm packages
run: npm install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
python-version: 3.9
- name: Install python dependencies 🐍
run: pip install -r requirements.txt -r requirements-dev.txt
- name: Use Node.js v14
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '14'
node-version: '18'
- name: Install and Build 🔧
run: |
npm install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/image-build-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 14
node-version: 18

- name: Run integration tests with cypress
uses: cypress-io/github-action@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests-cypress-record.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 14
node-version: 18

- name: Run integration tests with cypress
uses: cypress-io/github-action@v4
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# only need to do the node build once, even if we're building multi-arch
FROM --platform=$BUILDPLATFORM node:14-buster-slim as nodebuilder
FROM --platform=$BUILDPLATFORM node:18-bullseye-slim as nodebuilder
COPY package.json package-lock.json /app/
COPY frontend/package.json frontend/package-lock.json /app/frontend/
WORKDIR /app
Expand All @@ -8,7 +8,7 @@ COPY frontend/ /app/frontend/
RUN npm run build


FROM python:3.9-slim-buster AS backend
FROM python:3.9-slim-bullseye AS backend
ARG TARGETARCH
ENV PYTHONUNBUFFERED 1
RUN apt-get --allow-releaseinfo-change update && \
Expand Down Expand Up @@ -47,7 +47,7 @@ WORKDIR /app/
USER root
RUN apt-get update && \
apt-get -y install curl gnupg xvfb libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
RUN apt-get -y install nodejs
USER gate:gate
COPY requirements-dev.txt .
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/developerguide/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ python libraries and nodejs which is used to install javascript libraries.
* Install nodejs, postgresql and openssl in the conda environment
```bash
(teamware)$ conda install -y -c conda-forge postgresql=14.*
(teamware)$ conda install -y -c conda-forge nodejs=14.*
(teamware)$ conda install -y -c conda-forge nodejs=18.*
```
* Install nodejs dependencies
```bash
Expand Down
36 changes: 18 additions & 18 deletions docs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading