Merge "Change NPD version to v0.8.14 for Focal add Jammy image"
This commit is contained in:
commit
16baf66241
|
@ -1,7 +1,7 @@
|
|||
ARG FROM=docker.io/ubuntu:focal
|
||||
FROM ${FROM}
|
||||
|
||||
ARG NPD_VERSION="v0.8.15"
|
||||
ARG NPD_VERSION="v0.8.14"
|
||||
ARG NPD_SRC_URL="https://github.com/kubernetes/node-problem-detector/releases/download/${NPD_VERSION}"
|
||||
|
||||
RUN apt-get update ;\
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
ARG FROM=docker.io/ubuntu:bionic
|
||||
ARG FROM=docker.io/ubuntu:jammy
|
||||
FROM ${FROM}
|
||||
|
||||
ARG NPD_VERSION="v0.8.15"
|
|
@ -6,7 +6,7 @@ cd ${SCRIPT_DIR}/..
|
|||
|
||||
IMAGE="node-problem-detector"
|
||||
VERSION=${VERSION:-latest}
|
||||
DISTRO=${DISTRO:-ubuntu_focal}
|
||||
DISTRO=${DISTRO:-ubuntu_jammy}
|
||||
REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"}
|
||||
EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""}
|
||||
|
||||
|
|
|
@ -37,10 +37,10 @@
|
|||
docker_images:
|
||||
- context: node-problem-detector
|
||||
repository: openstackhelm/node-problem-detector
|
||||
dockerfile: Dockerfile.ubuntu_focal
|
||||
dockerfile: Dockerfile.ubuntu_jammy
|
||||
tags:
|
||||
- latest-ubuntu_focal
|
||||
- "ubuntu_focal-{{ currentdate }}"
|
||||
- latest-ubuntu_jammy
|
||||
- "ubuntu_jammy-{{ currentdate }}"
|
||||
files: &node-problem-detector_files
|
||||
- node-problem-detector/.*
|
||||
- zuul.d/node-problem-detector.yaml
|
||||
|
|
Loading…
Reference in New Issue