Skip to content
Snippets Groups Projects
Commit e70511b7 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Added base image with Ubuntu 22.04 and renamed the previous one to let them...

Added base image with Ubuntu 22.04 and renamed the previous one to let them co-exist. Update some software versions.
parent fe2ae1cb
No related branches found
No related tags found
No related merge requests found
FROM rosetta/base FROM rosetta/base_ubuntu22.04
MAINTAINER Stefano Alberto Russo <stefano.russo@gmail.com> MAINTAINER Stefano Alberto Russo <stefano.russo@gmail.com>
# Always start with an apt-get update when extending Reyns images, # Always start with an apt-get update when extending Reyns images,
......
FROM rosetta/base FROM rosetta/base_ubuntu18.04
MAINTAINER Stefano Alberto Russo <stefano.russo@gmail.com> MAINTAINER Stefano Alberto Russo <stefano.russo@gmail.com>
#---------------------- #----------------------
......
FROM rosetta/base FROM rosetta/base_ubuntu22.04
MAINTAINER Stefano Alberto Russo <stefano.russo@gmail.com> MAINTAINER Stefano Alberto Russo <stefano.russo@gmail.com>
# Always start with an apt-get update when extending base images, # Always start with an apt-get update when extending base images,
...@@ -29,13 +29,16 @@ RUN apt-get install python3-dev -y ...@@ -29,13 +29,16 @@ RUN apt-get install python3-dev -y
# Install postgres driver required for psycopg2 # Install postgres driver required for psycopg2
RUN apt-get install libpq-dev -y RUN apt-get install libpq-dev -y
# Libmagic
RUN apt-get install libmagic1 -y
# Docker # Docker
RUN apt-get install docker.io -y RUN apt-get install docker.io -y
#------------------------------ #------------------------------
# Viz # Viz
#------------------------------ #------------------------------
RUN apt install python-pygraphviz graphviz-dev -y RUN apt install python3-pygraphviz graphviz-dev -y
RUN pip3 install django-extensions==3.1.5 pygraphviz==1.6 RUN pip3 install django-extensions==3.1.5 pygraphviz==1.6
# Example usage: rosetta/shell webapp "cd /opt/code && python3 manage.py graph_models core_app --exclude-models LoginToken,Text -o ORM.png" # Example usage: rosetta/shell webapp "cd /opt/code && python3 manage.py graph_models core_app --exclude-models LoginToken,Text -o ORM.png"
...@@ -51,8 +54,8 @@ RUN mkdir /opt/code ...@@ -51,8 +54,8 @@ RUN mkdir /opt/code
COPY requirements.txt /tmp/ COPY requirements.txt /tmp/
RUN cd /opt/code && pip3 install -r /tmp/requirements.txt RUN cd /opt/code && pip3 install -r /tmp/requirements.txt
# Patch Django 2.2 non-ascii chars in /usr/local/lib/python3.6/dist-packages/django/views/templates/technical_500.html # Patch Django 2.2 non-ascii chars in /usr/local/lib/python3.10/dist-packages/django/views/templates/technical_500.html
RUN sed -i 's/[\x80-\xFF]/./g' /usr/local/lib/python3.6/dist-packages/django/views/templates/technical_500.html RUN sed -i 's/[\x80-\xFF]/./g' /usr/local/lib/python3.10/dist-packages/django/views/templates/technical_500.html
# Install App code # Install App code
COPY code /opt/code COPY code /opt/code
...@@ -81,4 +84,3 @@ COPY supervisord_dregistrytunnel.conf /etc/supervisor/conf.d/ ...@@ -81,4 +84,3 @@ COPY supervisord_dregistrytunnel.conf /etc/supervisor/conf.d/
COPY prestartup_webapp.sh /prestartup/ COPY prestartup_webapp.sh /prestartup/
RUN touch -m /prestartup/prestartup_webapp.sh RUN touch -m /prestartup/prestartup_webapp.sh
Django==2.2.1 Django==2.2.1
psycopg2==2.8 psycopg2==2.8
pytz==2018.9 pytz==2022.7.1
djangorestframework==3.9.3 djangorestframework==3.9.3
django-rest-swagger==2.2.0 django-rest-swagger==2.2.0
dateutils==0.6.6 dateutils==0.6.6
sendgrid==5.3.0 sendgrid==5.3.0
mozilla-django-oidc==1.2.4 mozilla-django-oidc==1.2.4
uwsgi==2.0.19.1 uwsgi==2.0.20
python-magic==0.4.15 python-magic==0.4.15
jupyter-repo2docker==2022.2.0 jupyter-repo2docker==2022.2.0
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment