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:
parent
31d491413a
commit
32e8e36677
@ -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
|
These lines will get rid of duplicate logs, generated because of the formatter
|
||||||
attached by oslo-rootwrap.
|
attached by oslo-rootwrap.
|
||||||
*/}}
|
*/}}
|
||||||
sed -i "/rootwrap_logger.setLevel/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/python2.7/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/python2.7/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/python2.7/dist-packages/oslo_rootwrap/wrapper.py
|
sed -i "/rootwrap_logger.addHandler/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/python
|
#!/usr/bin/python3
|
||||||
{{/*
|
{{/*
|
||||||
Copyright 2019 The Openstack-Helm Authors.
|
Copyright 2019 The Openstack-Helm Authors.
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
@ -24,7 +24,7 @@ release_group: null
|
|||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
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
|
image_repo_sync: docker.io/docker:18.09.02
|
||||||
pull_policy: IfNotPresent
|
pull_policy: IfNotPresent
|
||||||
local_registry:
|
local_registry:
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
ARG FROM=ubuntu:16.04
|
ARG FROM=docker.io/ubuntu:bionic
|
||||||
FROM ${FROM}
|
FROM ${FROM}
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
|
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 && \
|
sed -i '/nobody/d' /etc/passwd && \
|
||||||
echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd && \
|
echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
apt-get dist-upgrade -y && \
|
|
||||||
apt-get install -y \
|
apt-get install -y \
|
||||||
bash \
|
bash \
|
||||||
moreutils \
|
moreutils \
|
||||||
mysql-client \
|
mysql-client \
|
||||||
python-oslo.rootwrap \
|
python3 \
|
||||||
|
python3-pip \
|
||||||
python3-oslo.rootwrap \
|
python3-oslo.rootwrap \
|
||||||
screen \
|
|
||||||
sudo \
|
sudo \
|
||||||
rsyslog \
|
rsyslog && \
|
||||||
vim && \
|
|
||||||
sed -i 's/$PrivDropToUser syslog/$PrivDropToUser nobody/' /etc/rsyslog.conf && \
|
sed -i 's/$PrivDropToUser syslog/$PrivDropToUser nobody/' /etc/rsyslog.conf && \
|
||||||
apt-get clean -y && \
|
apt-get clean -y && \
|
||||||
rm -rf \
|
rm -rf \
|
||||||
/tmp/* \
|
/tmp/* \
|
||||||
/var/cache/debconf/* \
|
/var/cache/debconf/* \
|
||||||
/var/lib/apt/lists/* \
|
/var/lib/apt/lists/* \
|
||||||
/var/log/* \
|
|
||||||
/var/tmp/*
|
/var/tmp/*
|
||||||
|
|
||||||
CMD ["/bin/bash"]
|
CMD ["/bin/bash"]
|
@ -17,7 +17,7 @@
|
|||||||
parent: &parent airship-porthole-images
|
parent: &parent airship-porthole-images
|
||||||
vars:
|
vars:
|
||||||
image_name: &image_name porthole-mysqlclient-utility
|
image_name: &image_name porthole-mysqlclient-utility
|
||||||
distro_suffix: &distro_suffix ubuntu_xenial
|
distro_suffix: &distro_suffix ubuntu_bionic
|
||||||
files:
|
files:
|
||||||
- ^charts/mysqlclient-utility/.*$
|
- ^charts/mysqlclient-utility/.*$
|
||||||
- ^images/mysqlclient-utility/.*$
|
- ^images/mysqlclient-utility/.*$
|
||||||
|
Loading…
x
Reference in New Issue
Block a user