Etcdctl utility container image python and Ubuntu upgrades
Currently etcdctl utility container image is built using Ubuntu 16.04 so upgrading it to use Ubuntu Bionic and also upgrading Python 2.x to 3.x. Change-Id: I24212878fcb004f7043d78b7cffb9364cb745e97
This commit is contained in:
parent
d6b23767ba
commit
04c1b9fab8
@ -18,7 +18,7 @@ set -ex
|
|||||||
sed -i 's/$PrivDropToUser syslog/$PrivDropToUser nobody/' /etc/rsyslog.conf
|
sed -i 's/$PrivDropToUser syslog/$PrivDropToUser nobody/' /etc/rsyslog.conf
|
||||||
/etc/init.d/rsyslog start
|
/etc/init.d/rsyslog start
|
||||||
|
|
||||||
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.
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ release_group: null
|
|||||||
images:
|
images:
|
||||||
pull_policy: IfNotPresent
|
pull_policy: IfNotPresent
|
||||||
tags:
|
tags:
|
||||||
etcdctl_utility: 'quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_xenial'
|
etcdctl_utility: 'quay.io/airshipit/porthole-etcdctl-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' \
|
||||||
@ -23,12 +23,11 @@ RUN set -xe && \
|
|||||||
apt-get install -y \
|
apt-get install -y \
|
||||||
bash \
|
bash \
|
||||||
moreutils \
|
moreutils \
|
||||||
python-oslo.rootwrap \
|
python3 \
|
||||||
|
python3-pip \
|
||||||
python3-oslo.rootwrap \
|
python3-oslo.rootwrap \
|
||||||
screen \
|
|
||||||
sudo \
|
sudo \
|
||||||
rsyslog \
|
rsyslog && \
|
||||||
vim && \
|
|
||||||
TMP_DIR=$(mktemp --directory) && \
|
TMP_DIR=$(mktemp --directory) && \
|
||||||
cd ${TMP_DIR} && \
|
cd ${TMP_DIR} && \
|
||||||
curl -sSL https://github.com/coreos/etcd/releases/download/v${ETCDCTL_VERSION}/etcd-v${ETCDCTL_VERSION}-linux-amd64.tar.gz \
|
curl -sSL https://github.com/coreos/etcd/releases/download/v${ETCDCTL_VERSION}/etcd-v${ETCDCTL_VERSION}-linux-amd64.tar.gz \
|
@ -17,7 +17,7 @@
|
|||||||
parent: &parent airship-porthole-images
|
parent: &parent airship-porthole-images
|
||||||
vars:
|
vars:
|
||||||
image_name: &image_name porthole-etcdctl-utility
|
image_name: &image_name porthole-etcdctl-utility
|
||||||
distro_suffix: &distro_suffix ubuntu_xenial
|
distro_suffix: &distro_suffix ubuntu_bionic
|
||||||
files:
|
files:
|
||||||
- ^images/etcdctl-utility/.*$
|
- ^images/etcdctl-utility/.*$
|
||||||
- ^charts/etcdctl-utility/.*$
|
- ^charts/etcdctl-utility/.*$
|
||||||
|
Loading…
x
Reference in New Issue
Block a user