Skip to content

Commit

Permalink
Merge pull request #69 from IQSS/67-update-v4.15
Browse files Browse the repository at this point in the history
67 - update to v4.15
  • Loading branch information
poikilotherm authored Jun 18, 2019
2 parents 2dd92af + ec2dec1 commit c11fb84
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Running Dataverse on Kubernetes

[![Dataverse](https://img.shields.io/badge/Dataverse-v4.14-important.svg)](https://dataverse.org)
[![Dataverse](https://img.shields.io/badge/Dataverse-v4.15-important.svg)](https://dataverse.org)
[![Test Status](https://travis-ci.org/IQSS/dataverse-kubernetes.svg?branch=master)](https://travis-ci.org/IQSS/dataverse-kubernetes)
[![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)
Expand Down
2 changes: 1 addition & 1 deletion docker/dataverse-k8s/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ FROM centos:7
LABEL maintainer="FDM FZJ <[email protected]>"

ARG TINI_VERSION=v0.18.0
ARG VERSION=4.14
ARG VERSION=4.15
ARG DOMAIN=domain1

ENV HOME_DIR=/opt/dataverse\
Expand Down
2 changes: 1 addition & 1 deletion docker/solr-k8s/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM solr:7.3.1

LABEL maintainer="FDM FZJ <[email protected]>"

ARG VERSION=4.14
ARG VERSION=4.15
ARG COLLECTION=collection1
ENV SOLR_OPTS="-Dsolr.jetty.request.header.size=102400"\
COLLECTION_DIR=/opt/solr/server/solr/${COLLECTION}\
Expand Down
4 changes: 2 additions & 2 deletions docs/images.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.14 docker/dataverse-k8s
docker build -t iqss/solr-k8s:4.14 docker/solr-k8s
docker build -t iqss/dataverse-k8s:4.15 docker/dataverse-k8s
docker build -t iqss/solr-k8s:4.15 docker/solr-k8s
```
*Please remember to change the tag above as appropriate. You should be*
*using tagged images as best practice, not 'latest'.*
Expand Down
2 changes: 1 addition & 1 deletion k8s/dataverse/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
spec:
containers:
- name: dataverse
image: iqss/dataverse-k8s:4.14
image: iqss/dataverse-k8s:4.15
ports:
- containerPort: 8080
envFrom:
Expand Down
2 changes: 1 addition & 1 deletion k8s/dataverse/jobs/bootstrap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
spec:
containers:
- name: dv-bootstrap
image: iqss/dataverse-k8s:4.14
image: iqss/dataverse-k8s:4.15
command: ["scripts/bootstrap-job.sh"]
envFrom:
- configMapRef:
Expand Down
2 changes: 1 addition & 1 deletion k8s/dataverse/jobs/configure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: dv-bootstrap
image: iqss/dataverse-k8s:4.14
image: iqss/dataverse-k8s:4.15
command: ["scripts/config-job.sh"]
envFrom:
- configMapRef:
Expand Down
2 changes: 1 addition & 1 deletion k8s/solr/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
spec:
containers:
- name: solr
image: iqss/solr-k8s:4.14
image: iqss/solr-k8s:4.15
ports:
- containerPort: 8983
volumeMounts:
Expand Down

0 comments on commit c11fb84

Please sign in to comment.