Update from master
Squashed commit of the following:
commit 1c0bfb77f2da82d5a6047f91c3df9d804dbd275e
Author: Gabriel Cuba <gcuba@whitestack.com>
Date: Fri May 12 17:21:08 2023 -0500
Update charset-normalizer to resolve dependency conflict
Change-Id: I43a91a91029838bd0b0c0725b83c9d55251a4800
Signed-off-by: Gabriel Cuba <gcuba@whitestack.com>
commit db266c39aa56ad25ebb9856b98b71b738cc2b59d
Author: Mark Beierl <mark.beierl@canonical.com>
Date: Thu May 11 13:18:21 2023 -0400
Removing charset constraint
With py3.10, we are able to move to newer versions of the
packages, so pinning to a lower version is no longer required
Change-Id: I00410412e8fe473c93cef72a08d582d5aaaf1c58
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
commit 072b0bdeb1a0919c5cc8de128fa3c62e8393ed7c
Author: Mark Beierl <mark.beierl@canonical.com>
Date: Wed May 10 15:43:03 2023 -0400
Update to Python 3.10 and Ubuntu 22.04
Removal of deprecated event loop
Updated pip requirements
Change-Id: I96a895d8f9fa8db89e6bbfd6f009d4f56deaa418
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
commit ca2fd226036f433ba97c427fbfdb08e2a339ab08
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue Apr 4 15:26:09 2023 +0200
Clean stage-archive.sh and use allowlist in tox.ini
Change-Id: Ia360e247bf2f58aaa8477653ec1f161cf715a064
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
Change-Id: Ib796b0f060d525b99488f883bbfce5af30aff2a7
Signed-off-by: Dario Faccin <dario.faccin@canonical.com>
diff --git a/Dockerfile b/Dockerfile
index c597522..27ab273 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@
# devops-stages/stage-build.sh
#
-FROM ubuntu:20.04
+FROM ubuntu:22.04
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
@@ -37,7 +37,9 @@
python3 \
python3-all \
python3-dev \
- python3-setuptools
+ python3-setuptools \
+ python3-pip \
+ tox
-RUN python3 -m easy_install pip==21.3.1
-RUN pip install tox==3.24.5
+ENV LC_ALL C.UTF-8
+ENV LANG C.UTF-8