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.

Sign up for GitHub

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

Jump to bottom

Upgrade to Ubuntu 22.04, Python 3.10, Update NPM Packages and Python Packages #1834

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

Upgrade to Ubuntu 22.04, Python 3.10, Update NPM Packages and Python Packages #1834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
df71deb
Update npm packages
gregelin Nov 11, 2023
c2dcad2
Update CHANGELOG, VERSION
gregelin Nov 11, 2023
2b60ea4
Upgrade to Ubuntu 22.04, Python 3.10, python packages, docker image
gregelin Nov 11, 2023
e265275
Sync backend Dockerfiles
gregelin Nov 11, 2023
86c582a
Updated config.yml
gregelin Nov 11, 2023
a413da7
Lock @mui/material 5.2.2 to avoid OptionUnstyle breaking change in 5.…
gregelin Nov 13, 2023
c120a2f
Merge remote-tracking branch 'refs/remotes/origin/npm_update_nov-pyth…
gregelin Nov 13, 2023
2304b5e
Fixing npm mui references
gregelin Nov 13, 2023
9da4c63
Fixing mui unstyled
gregelin Nov 13, 2023
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ workflows:
jobs:
security-checks:
docker:
- image: cimg/python:3.8.12
- image: cimg/python:3.10.5
steps:
# Add .local/bin to PATH for utilities install by `pip install --user`.
- run: echo 'export PATH=~/.local/bin:$PATH' >> $BASH_ENV
Expand Down
27 changes: 27 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,33 @@
GovReady-Q Release Notes
========================


v0.11.10 (Nov 11, 2023)
---------------------------

**Developer changes**

* Upgrade Backend docker image from ubuntu:focal-20210119 to ubuntu:jammy-20231004
* Modification to docker image to install libmagic and and other changes
* Reduce calls to update Ubuntu in Docker image doing in install
* Upgrade to using Python 3.10.x
* Upgrade Python Packages: Django (3.2.19 to 3.2.22), urllib3 (2.0.3 to 2.0.7), compliance-trestle (2.0.0 to 2.4.0), Pygments (2.7.4 to 2.16.1), cryptography (41.0.0 to 41.0.5), and transitive packages
* Add Python package +python-magic=
* Remove libmariadbclient from install in Docker file
* Remove backports.zoneinfo
* Remove backports.zoneinfo==0.2.1 # Apache 2.0 from installs because using Python 3.10
* Install Ubuntu libmagic library and python-magic package
* Add 'allauth.account.middleware.AccountMiddleware', to settings.py MIDDLEWARE


v0.11.9 (Nov 11, 2023)
---------------------------

**Developer changes**

* Upgrade NPM packages


v0.11.8 (June 11, 2023)
---------------------------

Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.11.8
v0.11.9
22 changes: 13 additions & 9 deletions dev_env/docker/images/backend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Ubuntu 20.04 focal-20210119
FROM ubuntu:focal-20210119
# Ubuntu 22.04 jammy-20231004
FROM ubuntu:jammy-20231004

# Update package list.
ENV DEBIAN_FRONTEND=noninteractive

# Set up the locale.
RUN apt-get update && \
apt-get install -y locales openssh-sftp-server openssh-server xvfb libfontconfig libmariadbclient-dev && \
apt-get install -y locales openssh-sftp-server openssh-server xvfb libfontconfig && \
echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \
dpkg-reconfigure locales && \
update-locale LANG=en_US.UTF-8
Expand All @@ -18,25 +18,29 @@ RUN echo "root:root" | chpasswd && \
mkdir /var/run/sshd

# Set up the timezone.
RUN apt-get update && apt-get install -y --no-install-recommends tzdata && \
RUN apt-get install -y --no-install-recommends tzdata && \
ln -fs /usr/share/zoneinfo/UTC /etc/localtime && \
dpkg-reconfigure tzdata

# Install GovReady-Q prerequisites.
RUN apt-get update && apt-get -y install \
RUN apt-get -y install \
unzip git curl jq \
python3 python3-pip \
python3-yaml \
graphviz pandoc \
gunicorn
gunicorn libmagic-dev

# Set up tools
RUN apt install -y build-essential
RUN python3 -m pip install --upgrade setuptools

ENV CHROME_VERSION "google-chrome-stable"
RUN sed -i -- 's&deb http://deb.debian.org/debian jessie-updates main&#deb http://deb.debian.org/debian jessie-updates main&g' /etc/apt/sources.list \
&& apt-get update && apt-get install wget -y
&& apt-get install wget -y
ENV CHROME_VERSION "google-chrome-stable"
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
&& echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list \
&& apt-get update && apt-get -qqy install ${CHROME_VERSION:-google-chrome-stable}
&& apt-get -qqy install ${CHROME_VERSION:-google-chrome-stable}

# Chromium for Headless Selenium tests
RUN wget -O /tmp/chromedriver.zip http://chromedriver.storage.googleapis.com/`curl -sS chromedriver.storage.googleapis.com/LATEST_RELEASE`/chromedriver_linux64.zip \
Expand All @@ -46,7 +50,7 @@ ENV DISPLAY=:99
# Put the Python source code here.
WORKDIR /usr/src/app

RUN apt-get update && apt-get install -y wkhtmltopdf;
RUN apt-get install -y wkhtmltopdf;

# Upgrade pip to version 20.1+ - IMPORTANT
RUN python3 -m pip install --upgrade pip
Expand Down
22 changes: 13 additions & 9 deletions dev_env/docker/images/backend/Dockerfile.M1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Ubuntu 20.04 focal-20210119
FROM ubuntu:focal-20210119
# Ubuntu 22.04 jammy-20231004
FROM ubuntu:jammy-20231004

# Update package list.
ENV DEBIAN_FRONTEND=noninteractive

# Set up the locale.
RUN apt-get update && \
apt-get install -y locales openssh-sftp-server openssh-server xvfb libfontconfig libmariadbclient-dev && \
apt-get install -y locales openssh-sftp-server openssh-server xvfb libfontconfig && \
echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \
dpkg-reconfigure locales && \
update-locale LANG=en_US.UTF-8
Expand All @@ -18,25 +18,29 @@ RUN echo "root:root" | chpasswd && \
mkdir /var/run/sshd

# Set up the timezone.
RUN apt-get update && apt-get install -y --no-install-recommends tzdata && \
RUN apt-get install -y --no-install-recommends tzdata && \
ln -fs /usr/share/zoneinfo/UTC /etc/localtime && \
dpkg-reconfigure tzdata

# Install GovReady-Q prerequisites.
RUN apt-get update && apt-get -y install \
RUN apt-get -y install \
unzip git curl jq \
python3 python3-pip \
python3-yaml \
graphviz pandoc \
gunicorn
gunicorn libmagic-dev

# Set up tools
RUN apt install -y build-essential
RUN python3 -m pip install --upgrade setuptools

ENV CHROME_VERSION "google-chrome-stable"
RUN sed -i -- 's&deb http://deb.debian.org/debian jessie-updates main&#deb http://deb.debian.org/debian jessie-updates main&g' /etc/apt/sources.list \
&& apt-get update && apt-get install wget -y
&& apt-get install wget -y
ENV CHROME_VERSION "google-chrome-stable"
#RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
# && echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list \
# && apt-get update && apt-get -qqy install ${CHROME_VERSION:-google-chrome-stable}
# && apt-get -qqy install ${CHROME_VERSION:-google-chrome-stable}

# Chromium for Headless Selenium tests
#RUN wget -O /tmp/chromedriver.zip http://chromedriver.storage.googleapis.com/`curl -sS chromedriver.storage.googleapis.com/LATEST_RELEASE`/chromedriver_linux64.zip \
Expand All @@ -46,7 +50,7 @@ ENV DISPLAY=:99
# Put the Python source code here.
WORKDIR /usr/src/app

RUN apt-get update && apt-get install -y wkhtmltopdf;
RUN apt-get install -y wkhtmltopdf;

# Upgrade pip to version 20.1+ - IMPORTANT
RUN python3 -m pip install --upgrade pip
Expand Down
Loading