Update mariadb image building
This change removes the ubuntu xenial dockerfile as well as updates the base build file to the latest image ran in focal. Also removes the stein jobs from the zuul mariadb job list. Change-Id: Icaf76bcf157d34e3c5365a3214dfc544eca74952
This commit is contained in:
parent
d67563a7e9
commit
dc0cfc1b2f
@ -1,25 +0,0 @@
|
||||
# mariadb:10.4.12
|
||||
ARG FROM=docker.io/mariadb@sha256:b3116f425f51353e2ba71b04647977b035c2c578d276e2d4285bd2798e8199ae
|
||||
FROM ${FROM}
|
||||
|
||||
RUN set -ex ;\
|
||||
apt-get update ;\
|
||||
apt-get upgrade -y ;\
|
||||
apt-get install -y --no-install-recommends \
|
||||
python3-pip ;\
|
||||
pip3 --no-cache-dir install --upgrade pip ;\
|
||||
hash -r ;\
|
||||
pip3 --no-cache-dir install --upgrade setuptools ;\
|
||||
pip3 --no-cache-dir install --upgrade \
|
||||
configparser \
|
||||
iso8601 \
|
||||
kubernetes \
|
||||
pykube-ng ;\
|
||||
apt-get clean -y ;\
|
||||
rm -rf \
|
||||
/var/cache/debconf/* \
|
||||
/var/lib/apt/lists/* \
|
||||
/var/log/* \
|
||||
/tmp/* \
|
||||
/var/tmp/* ;\
|
||||
usermod -s /bin/false mysql
|
@ -5,8 +5,8 @@ SCRIPT_DIR=`dirname ${SCRIPT}`
|
||||
cd ${SCRIPT_DIR}/..
|
||||
|
||||
IMAGE="mariadb"
|
||||
VERSION=${VERSION:-10.5.3-bionic}
|
||||
DISTRO=${DISTRO:-ubuntu_bionic}
|
||||
VERSION=${VERSION:-10.5.9-focal}
|
||||
DISTRO=${DISTRO:-ubuntu_focal}
|
||||
REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"}
|
||||
EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""}
|
||||
docker build -f ${IMAGE}/Dockerfile.${DISTRO} --network=host -t ${REGISTRY_URI}${IMAGE}:${VERSION}-${DISTRO}${EXTRA_TAG_INFO} ${extra_build_args} ${IMAGE}
|
||||
|
@ -28,8 +28,8 @@
|
||||
- openstack-helm-images-upload-mariadb
|
||||
- openstack-helm-images-promote-mariadb:
|
||||
dependencies:
|
||||
- name: openstack-helm-images-compute-kit-stein-ubuntu_bionic
|
||||
- name: openstack-helm-images-compute-kit-train-ubuntu_bionic
|
||||
- name: openstack-helm-images-compute-kit-ussuri-ubuntu_bionic
|
||||
|
||||
- job:
|
||||
name: openstack-helm-images-build-mariadb
|
||||
|
Loading…
Reference in New Issue
Block a user