From 337661971ddc6ed322443b4fa0c9af6ea2df4009 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Jul 2019 09:59:13 +0200 Subject: [PATCH] #77. Updating images and manifests to v4.15.1. Solr image stays on 4.15 (no change necessary), just a re-tag. --- README.md | 2 +- docker/dataverse-k8s/Dockerfile | 2 +- docs/images.md | 4 ++-- k8s/dataverse/deployment.yaml | 4 ++-- k8s/dataverse/jobs/bootstrap.yaml | 4 ++-- k8s/dataverse/jobs/configure.yaml | 4 ++-- k8s/solr/deployment.yaml | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 820527cf..ca325239 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # Running Dataverse on Kubernetes -[![Dataverse](https://img.shields.io/badge/Dataverse-v4.15-important.svg)](https://dataverse.org) +[![Dataverse](https://img.shields.io/badge/Dataverse-v4.15.1-important.svg)](https://dataverse.org) [![Validation](https://jenkins.dataverse.org/job/dataverse-k8s/job/K8s%20Linting/badge/icon?subject=kubeval&status=valid&color=purple)](https://jenkins.dataverse.org/job/dataverse-k8s/job/K8s%20Linting/) [![Docker Hub Image](https://img.shields.io/static/v1.svg?label=image&message=dataverse-k8s&logo=docker)](https://hub.docker.com/r/iqss/dataverse-k8s) [![Docker Hub Image](https://img.shields.io/static/v1.svg?label=image&message=solr-k8s&logo=docker)](https://hub.docker.com/r/iqss/solr-k8s) diff --git a/docker/dataverse-k8s/Dockerfile b/docker/dataverse-k8s/Dockerfile index 8a7ab6b5..493969b4 100644 --- a/docker/dataverse-k8s/Dockerfile +++ b/docker/dataverse-k8s/Dockerfile @@ -9,7 +9,7 @@ FROM centos:7 LABEL maintainer="FDM FZJ " ARG TINI_VERSION=v0.18.0 -ARG VERSION=4.15 +ARG VERSION=4.15.1 ARG DOMAIN=domain1 ENV HOME_DIR=/opt/dataverse\ diff --git a/docs/images.md b/docs/images.md index 5f9fd768..561d0218 100644 --- a/docs/images.md +++ b/docs/images.md @@ -11,8 +11,8 @@ images to be used for the Dataverse deployment. Simple with Docker after cloning and accessing the source folder: ``` -docker build -t iqss/dataverse-k8s:4.15 docker/dataverse-k8s -docker build -t iqss/solr-k8s:4.15 docker/solr-k8s +docker build -t iqss/dataverse-k8s:4.15.1 docker/dataverse-k8s +docker build -t iqss/solr-k8s:4.15.1 docker/solr-k8s ``` *Please remember to change the tag above as appropriate. You should be* *using tagged images as best practice, not 'latest'.* diff --git a/k8s/dataverse/deployment.yaml b/k8s/dataverse/deployment.yaml index 372c3d71..ec18787f 100644 --- a/k8s/dataverse/deployment.yaml +++ b/k8s/dataverse/deployment.yaml @@ -5,7 +5,7 @@ metadata: name: dataverse labels: app.kubernetes.io/name: dataverse - app.kubernetes.io/version: "4.15" + app.kubernetes.io/version: "4.15.1" app.kubernetes.io/component: appserver app.kubernetes.io/part-of: dataverse app.kubernetes.io/managed-by: kubectl @@ -24,7 +24,7 @@ spec: spec: containers: - name: dataverse - image: iqss/dataverse-k8s:4.15 + image: iqss/dataverse-k8s:4.15.1 ports: - containerPort: 8080 envFrom: diff --git a/k8s/dataverse/jobs/bootstrap.yaml b/k8s/dataverse/jobs/bootstrap.yaml index c27dc117..80a2495f 100644 --- a/k8s/dataverse/jobs/bootstrap.yaml +++ b/k8s/dataverse/jobs/bootstrap.yaml @@ -4,7 +4,7 @@ metadata: name: bootstrap-dataverse labels: app.kubernetes.io/name: bootstrap - app.kubernetes.io/version: "4.15" + app.kubernetes.io/version: "4.15.1" app.kubernetes.io/component: job app.kubernetes.io/part-of: dataverse app.kubernetes.io/managed-by: kubectl @@ -17,7 +17,7 @@ spec: spec: containers: - name: dv-bootstrap - image: iqss/dataverse-k8s:4.15 + image: iqss/dataverse-k8s:4.15.1 command: ["scripts/bootstrap-job.sh"] envFrom: - configMapRef: diff --git a/k8s/dataverse/jobs/configure.yaml b/k8s/dataverse/jobs/configure.yaml index e381b8ed..f84ab725 100644 --- a/k8s/dataverse/jobs/configure.yaml +++ b/k8s/dataverse/jobs/configure.yaml @@ -5,7 +5,7 @@ metadata: generateName: configure-dataverse- labels: app.kubernetes.io/name: configure - app.kubernetes.io/version: "4.15" + app.kubernetes.io/version: "4.15.1" app.kubernetes.io/component: job app.kubernetes.io/part-of: dataverse app.kubernetes.io/managed-by: kubectl @@ -18,7 +18,7 @@ spec: spec: containers: - name: dv-bootstrap - image: iqss/dataverse-k8s:4.15 + image: iqss/dataverse-k8s:4.15.1 command: ["scripts/config-job.sh"] envFrom: - configMapRef: diff --git a/k8s/solr/deployment.yaml b/k8s/solr/deployment.yaml index 91356c12..2d7052a6 100644 --- a/k8s/solr/deployment.yaml +++ b/k8s/solr/deployment.yaml @@ -5,7 +5,7 @@ metadata: name: solr labels: app.kubernetes.io/name: solr - app.kubernetes.io/version: "4.15" + app.kubernetes.io/version: "4.15.1" app.kubernetes.io/component: searchindex app.kubernetes.io/part-of: dataverse app.kubernetes.io/managed-by: kubectl @@ -24,7 +24,7 @@ spec: spec: containers: - name: solr - image: iqss/solr-k8s:4.15 + image: iqss/solr-k8s:4.15.1 ports: - containerPort: 8983 volumeMounts: