The base image has been updated. As part of the base image update the
Python version has changed from 3.10 to 3.11.
See base image changes here: https://git.onap.org/integration/docker/onap-python/commit/?h=12.0.0&id=
b5ccfd6b07b0b14dc738030c7f33ee242f1724b7
Additionally, the pip requirements had to be updated because of issues
as noted by the comments. Some config values also needed to be
updated because they no longer worked inside of docker-compose.
TEST PLAN
PASS: Run docker-compose unit testing
PASS: Run compliance and quality robot tests, with mock SMO
* Deploy oran-o2 application on StarlingX system controller (stx8)
* Update/apply override for dev image
* Ensure O2 pod is running using correct image
Issue-ID: INF-437
Signed-off-by: jkraitbewr <joshua.kraitberg@windriver.com>
Change-Id: I321fe76fcf6f1617ca93bad88d3ea8984e877616
-FROM nexus3.onap.org:10001/onap/integration-python:10.1.0
+FROM nexus3.onap.org:10001/onap/integration-python:12.0.0
# https://nexus3.onap.org/#browse/search=keyword%3Dintegration-python:d406d405e4cfbf1186265b01088caf9a
# https://git.onap.org/integration/docker/onap-python/tree/Dockerfile
# https://nexus3.onap.org/#browse/search=keyword%3Dintegration-python:d406d405e4cfbf1186265b01088caf9a
# https://git.onap.org/integration/docker/onap-python/tree/Dockerfile
-FROM python:3.10-slim-buster
+FROM python:3.11-slim-buster
RUN apt-get update && apt-get install -y git gcc \
vim curl procps ssh
RUN apt-get update && apt-get install -y git gcc \
vim curl procps ssh
RUN mkdir -p /etc/kubeconfig/
# COPY temp/kubeconfig/config /etc/kubeconfig/
RUN mkdir -p /etc/kubeconfig/
# COPY temp/kubeconfig/config /etc/kubeconfig/
+RUN mkdir -p /var/log/orano2
+
# -e git+https://opendev.org/starlingx/distcloud-client.git@master#egg=distributedcloud-client&subdirectory=distributedcloud-client
# -e git+https://opendev.org/starlingx/config.git@master#egg=cgtsclient&subdirectory=sysinv/cgts-client/cgts-client
# -e git+https://opendev.org/starlingx/distcloud-client.git@master#egg=distributedcloud-client&subdirectory=distributedcloud-client
# -e git+https://opendev.org/starlingx/config.git@master#egg=cgtsclient&subdirectory=sysinv/cgts-client/cgts-client
-cryptography==3.3.2
-python-keystoneclient==3.21.0
\ No newline at end of file
+# https://github.com/JoinMarket-Org/joinmarket-clientserver/issues/1452
+cryptography>=35
+python-keystoneclient==3.21.0
- # host = os.environ.get("DB_HOST", "localhost")
- # port = 54321 if host == "localhost" else 5432
- host = "localhost"
- port = 5432
+ host = os.environ.get("DB_HOST", "localhost")
+ port = int(os.environ.get("DB_PORT", 5432))
password = os.environ.get("DB_PASSWORD", "o2ims123")
user, db_name = "o2ims", "o2ims"
return f"postgresql://{user}:{password}@{host}:{port}/{db_name}"
def get_api_url():
password = os.environ.get("DB_PASSWORD", "o2ims123")
user, db_name = "o2ims", "o2ims"
return f"postgresql://{user}:{password}@{host}:{port}/{db_name}"
def get_api_url():
- # host_interal = os.environ.get("API_HOST", "localhost")
- host_interal = "localhost"
+ host_interal = os.environ.get("API_HOST", "localhost")
host_external = os.environ.get("API_HOST_EXTERNAL_FLOATING")
if config.conf.OCLOUD.API_HOST_EXTERNAL_FLOATING is not None and \
config.conf.OCLOUD.API_HOST_EXTERNAL_FLOATING != '':
host_external = os.environ.get("API_HOST_EXTERNAL_FLOATING")
if config.conf.OCLOUD.API_HOST_EXTERNAL_FLOATING is not None and \
config.conf.OCLOUD.API_HOST_EXTERNAL_FLOATING != '':
def get_redis_host_and_port():
def get_redis_host_and_port():
- # host = os.environ.get("REDIS_HOST", "localhost")
- # port = 63791 if host == "localhost" else 6379
- host = "localhost"
- port = 6379
+ host = os.environ.get("REDIS_HOST", "localhost")
+ port = int(os.environ.get("REDIS_PORT", 6379))
return dict(host=host, port=port)
return dict(host=host, port=port)
+# https://github.com/python-restx/flask-restx/issues/567
+flask<3.0.0
flask-restx
sqlalchemy<2.0.0
redis
flask-restx
sqlalchemy<2.0.0
redis