openstack/openstack-helm-images
Code Issues Proposed changes

Merge "Update mariadb upload job"

Browse Source
This commit is contained in:
Zuul
2021-04-13 21:58:11 +00:00
committed by Gerrit Code Review
parent 3bef118879 1087d84d41
commit 0341d51f45
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mariadb/Dockerfile.ubuntu_bionic → mariadb/Dockerfile.ubuntu_focal
View File

@@ -1,10 +1,10 @@
# mariadb:10.5.3-bionic # mariadb:10.5.9-focal
ARG FROM=docker.io/mariadb@sha256:bd5b3470601aa4a28132ec60a8b1c33516d09a1391864fe1dbf82a4030397fd1 ARG FROM=docker.io/mariadb@sha256:7e244fae615587335176db07e88b43eee5e4762f35306e17c13c68125d93b9bf
FROM ${FROM} FROM ${FROM}
RUN set -ex ;\ RUN set -ex ;\
apt-get update ;\ apt update ;\
apt-get install -y --no-install-recommends \ apt install -y --no-install-recommends \
python3-pip ;\ python3-pip ;\
pip3 --no-cache-dir install --upgrade pip ;\ pip3 --no-cache-dir install --upgrade pip ;\
hash -r ;\ hash -r ;\
@@ -14,7 +14,7 @@ RUN set -ex ;\
iso8601 \ iso8601 \
kubernetes \ kubernetes \
pykube-ng ;\ pykube-ng ;\
apt-get clean -y ;\ apt clean -y ;\
rm -rf \ rm -rf \
/var/cache/debconf/* \ /var/cache/debconf/* \
/var/lib/apt/lists/* \ /var/lib/apt/lists/* \

7
zuul.d/mariadb.yaml
View File

@@ -37,13 +37,14 @@
description: Build mariadb images description: Build mariadb images
vars: &mariadb_vars vars: &mariadb_vars
currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}"
release: "focal"
docker_images: docker_images:
- context: mariadb - context: mariadb
repository: openstackhelm/mariadb repository: openstackhelm/mariadb
dockerfile: Dockerfile.ubuntu_xenial dockerfile: Dockerfile.ubuntu_{{ release }}
tags: tags:
- latest-ubuntu_xenial - "latest-ubuntu_{{ release }}"
- "ubuntu_xenial-{{ currentdate }}" - "ubuntu_{{ release }}-{{ currentdate }}"
files: &mariadb_files files: &mariadb_files
- mariadb/.* - mariadb/.*
- zuul.d/mariadb.yaml - zuul.d/mariadb.yaml