Mysqlclient UC Python and Ubuntu upgrade.

This Patchset updates from xenial to Bionic,
and Python from 2.0 to 3.0.

Change-Id: Ia3b75e51b685666e67b100925249c80e2343de4b
This commit is contained in:
diwakar thyagaraj 2019-11-26 20:46:30 +00:00
parent 31d491413a
commit 32e8e36677
5 changed files with 11 additions and 14 deletions

View File

@ -28,7 +28,7 @@ root logger by oslo-rootwrap module, imported in _openstack-utility-rootwrap.tpl
These lines will get rid of duplicate logs, generated because of the formatter
attached by oslo-rootwrap.
*/}}
sed -i "/rootwrap_logger.setLevel/s/.*/#&/" /usr/lib/python2.7/dist-packages/oslo_rootwrap/wrapper.py
sed -i "/handler.setFormatter/s/.*/#&/" /usr/lib/python2.7/dist-packages/oslo_rootwrap/wrapper.py
sed -i "/os.path.basename/s/.*/#&/" /usr/lib/python2.7/dist-packages/oslo_rootwrap/wrapper.py
sed -i "/rootwrap_logger.addHandler/s/.*/#&/" /usr/lib/python2.7/dist-packages/oslo_rootwrap/wrapper.py
sed -i "/rootwrap_logger.setLevel/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
sed -i "/handler.setFormatter/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
sed -i "/os.path.basename/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
sed -i "/rootwrap_logger.addHandler/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py

View File

@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python3
{{/*
Copyright 2019 The Openstack-Helm Authors.
Licensed under the Apache License, Version 2.0 (the "License");

View File

@ -24,7 +24,7 @@ release_group: null
images:
tags:
mysqlclient_utility: 'quay.io/airshipit/porthole-mysqlclient-utility:latest'
mysqlclient_utility: 'quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_bionic'
image_repo_sync: docker.io/docker:18.09.02
pull_policy: IfNotPresent
local_registry:

View File

@ -1,4 +1,4 @@
ARG FROM=ubuntu:16.04
ARG FROM=docker.io/ubuntu:bionic
FROM ${FROM}
LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
@ -12,24 +12,21 @@ RUN set -xe && \
sed -i '/nobody/d' /etc/passwd && \
echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd && \
apt-get update && \
apt-get dist-upgrade -y && \
apt-get install -y \
bash \
moreutils \
mysql-client \
python-oslo.rootwrap \
python3 \
python3-pip \
python3-oslo.rootwrap \
screen \
sudo \
rsyslog \
vim && \
rsyslog && \
sed -i 's/$PrivDropToUser syslog/$PrivDropToUser nobody/' /etc/rsyslog.conf && \
apt-get clean -y && \
rm -rf \
/tmp/* \
/var/cache/debconf/* \
/var/lib/apt/lists/* \
/var/log/* \
/var/tmp/*
CMD ["/bin/bash"]

View File

@ -17,7 +17,7 @@
parent: &parent airship-porthole-images
vars:
image_name: &image_name porthole-mysqlclient-utility
distro_suffix: &distro_suffix ubuntu_xenial
distro_suffix: &distro_suffix ubuntu_bionic
files:
- ^charts/mysqlclient-utility/.*$
- ^images/mysqlclient-utility/.*$