Spring/spring-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAMONGO-2427 - Simplify docker setup.

Browse Source 
Original pull request: #823.
This commit is contained in:
Mark Paluch
2020-01-27 10:34:27 +01:00
parent 9abf098bdb
commit c83929c2a3
7 changed files with 52 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -21,7 +21,7 @@ matrix:
env: env:
matrix: matrix:
- MONGO_VERSION=4.2.2 - MONGO_VERSION=4.2.0
- MONGO_VERSION=4.0.14 - MONGO_VERSION=4.0.14
- MONGO_VERSION=3.6.16 - MONGO_VERSION=3.6.16
- MONGO_VERSION=3.4.23 - MONGO_VERSION=3.4.23

30
Jenkinsfile vendored
View File

@@ -39,23 +39,7 @@ pipeline {
steps { steps {
script { script {
def image = docker.build("springci/spring-data-openjdk8-with-mongodb-4.2", "ci/openjdk8-mongodb-4.2/") def image = docker.build("springci/spring-data-openjdk8-with-mongodb-4.2.0", "ci/openjdk8-mongodb-4.2/")
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
image.push()
}
}
}
}
stage('Publish JDK 8 + MongoDB 4.3') {
when {
changeset "ci/openjdk8-mongodb-4.3/**"
}
agent { label 'data' }
options { timeout(time: 30, unit: 'MINUTES') }
steps {
script {
def image = docker.build("springci/spring-data-openjdk8-with-mongodb-4.3", "ci/openjdk8-mongodb-4.3/")
docker.withRegistry('', 'hub.docker.com-springbuildmaster') { docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
image.push() image.push()
} }
@@ -71,7 +55,7 @@ pipeline {
steps { steps {
script { script {
def image = docker.build("springci/spring-data-openjdk11-with-mongodb-4.2", "ci/openjdk11-mongodb-4.2/") def image = docker.build("springci/spring-data-openjdk11-with-mongodb-4.2.0", "ci/openjdk11-mongodb-4.2/")
docker.withRegistry('', 'hub.docker.com-springbuildmaster') { docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
image.push() image.push()
} }
@@ -87,7 +71,7 @@ pipeline {
steps { steps {
script { script {
def image = docker.build("springci/spring-data-openjdk13-with-mongodb-4.2", "ci/openjdk13-mongodb-4.2/") def image = docker.build("springci/spring-data-openjdk13-with-mongodb-4.2.0", "ci/openjdk13-mongodb-4.2/")
docker.withRegistry('', 'hub.docker.com-springbuildmaster') { docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
image.push() image.push()
} }
@@ -106,7 +90,7 @@ pipeline {
} }
agent { agent {
docker { docker {
image 'springci/spring-data-openjdk8-with-mongodb-4.3:latest' image 'springci/spring-data-openjdk8-with-mongodb-4.2.0:latest'
label 'data' label 'data'
args '-v $HOME:/tmp/jenkins-home' args '-v $HOME:/tmp/jenkins-home'
} }
@@ -154,7 +138,7 @@ pipeline {
stage("test: mongodb 4.2 (jdk8)") { stage("test: mongodb 4.2 (jdk8)") {
agent { agent {
docker { docker {
image 'springci/spring-data-openjdk8-with-mongodb-4.2:latest' image 'springci/spring-data-openjdk8-with-mongodb-4.2.0:latest'
label 'data' label 'data'
args '-v $HOME:/tmp/jenkins-home' args '-v $HOME:/tmp/jenkins-home'
} }
@@ -174,7 +158,7 @@ pipeline {
stage("test: baseline (jdk11)") { stage("test: baseline (jdk11)") {
agent { agent {
docker { docker {
image 'springci/spring-data-openjdk11-with-mongodb-4.2:latest' image 'springci/spring-data-openjdk11-with-mongodb-4.2.0:latest'
label 'data' label 'data'
args '-v $HOME:/tmp/jenkins-home' args '-v $HOME:/tmp/jenkins-home'
} }
@@ -194,7 +178,7 @@ pipeline {
stage("test: baseline (jdk13)") { stage("test: baseline (jdk13)") {
agent { agent {
docker { docker {
image 'springci/spring-data-openjdk13-with-mongodb-4.2:latest' image 'springci/spring-data-openjdk13-with-mongodb-4.2.0:latest'
label 'data' label 'data'
args '-v $HOME:/tmp/jenkins-home' args '-v $HOME:/tmp/jenkins-home'
} }

21
ci/openjdk11-mongodb-4.2/Dockerfile
View File

@@ -1,14 +1,15 @@
FROM adoptopenjdk/openjdk11:latest FROM adoptopenjdk/openjdk11:latest
RUN apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ENV TZ=Etc/UTC
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b RUN set -eux; \
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b ; \
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list; \
echo ${TZ} > /etc/timezone;
RUN echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list RUN apt-get update ; \
apt-get install -y mongodb-org=4.2.0 mongodb-org-server=4.2.0 mongodb-org-shell=4.2.0 mongodb-org-mongos=4.2.0 mongodb-org-tools=4.2.0 ; \
RUN apt-get update apt-get clean; \
rm -rf /var/lib/apt/lists/*;
RUN apt-get install -y mongodb-org=4.2.2 mongodb-org-server=4.2.2 mongodb-org-shell=4.2.2 mongodb-org-mongos=4.2.2 mongodb-org-tools=4.2.2
RUN apt-get clean \
&& rm -rf /var/lib/apt/lists/*

21
ci/openjdk13-mongodb-4.2/Dockerfile
View File

@@ -1,14 +1,15 @@
FROM adoptopenjdk/openjdk13:latest FROM adoptopenjdk/openjdk13:latest
RUN apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ENV TZ=Etc/UTC
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b RUN set -eux; \
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b ; \
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list; \
echo ${TZ} > /etc/timezone;
RUN echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list RUN apt-get update ; \
apt-get install -y mongodb-org=4.2.0 mongodb-org-server=4.2.0 mongodb-org-shell=4.2.0 mongodb-org-mongos=4.2.0 mongodb-org-tools=4.2.0 ; \
RUN apt-get update apt-get clean; \
rm -rf /var/lib/apt/lists/*;
RUN apt-get install -y mongodb-org=4.2.2 mongodb-org-server=4.2.2 mongodb-org-shell=4.2.2 mongodb-org-mongos=4.2.2 mongodb-org-tools=4.2.2
RUN apt-get clean \
&& rm -rf /var/lib/apt/lists/*

21
ci/openjdk8-mongodb-4.0/Dockerfile
View File

@@ -1,14 +1,15 @@
FROM adoptopenjdk/openjdk8:latest FROM adoptopenjdk/openjdk8:latest
RUN apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ENV TZ=Etc/UTC
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 RUN RUN set -eux; \
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 ; \
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list; \
echo ${TZ} > /etc/timezone;
RUN echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list RUN apt-get update ; \
apt-get install -y mongodb-org=4.0.14 mongodb-org-server=4.0.14 mongodb-org-shell=4.0.14 mongodb-org-mongos=4.0.14 mongodb-org-tools=4.0.14 ; \
RUN apt-get update apt-get clean; \
rm -rf /var/lib/apt/lists/*;
RUN apt-get install -y mongodb-org=4.0.14 mongodb-org-server=4.0.14 mongodb-org-shell=4.0.14 mongodb-org-mongos=4.0.14 mongodb-org-tools=4.0.14
RUN apt-get clean \
&& rm -rf /var/lib/apt/lists/*

21
ci/openjdk8-mongodb-4.2/Dockerfile
View File

@@ -1,14 +1,15 @@
FROM adoptopenjdk/openjdk8:latest FROM adoptopenjdk/openjdk8:latest
RUN apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ENV TZ=Etc/UTC
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b RUN set -eux; \
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b ; \
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list; \
echo ${TZ} > /etc/timezone;
RUN echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list RUN apt-get update ; \
apt-get install -y mongodb-org=4.2.0 mongodb-org-server=4.2.0 mongodb-org-shell=4.2.0 mongodb-org-mongos=4.2.0 mongodb-org-tools=4.2.0 ; \
RUN apt-get update apt-get clean; \
rm -rf /var/lib/apt/lists/*;
RUN apt-get install -y mongodb-org=4.2.2 mongodb-org-server=4.2.2 mongodb-org-shell=4.2.2 mongodb-org-mongos=4.2.2 mongodb-org-tools=4.2.2
RUN apt-get clean \
&& rm -rf /var/lib/apt/lists/*

14
ci/openjdk8-mongodb-4.3/Dockerfile
View File

@@ -1,14 +0,0 @@
FROM adoptopenjdk/openjdk8:latest
RUN apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2
RUN apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b
RUN echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/development multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.3.list
RUN apt-get update
RUN apt-get install -y mongodb-org=4.3.2 mongodb-org-server=4.3.2 mongodb-org-shell=4.3.2 mongodb-org-mongos=4.3.2 mongodb-org-tools=4.3.2
RUN apt-get clean \
&& rm -rf /var/lib/apt/lists/*