GitHub-Spring
/
spring-data-mongodb
mirror of https://github.com/spring-projects/spring-data-mongodb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

DATAMONGO-2427 - Simplify docker setup. 

Original pull request: #823.
pull/830/head
Mark Paluch 6 years ago
parent
9abf098bdb
commit
c83929c2a3
No known key found for this signature in database
GPG Key ID: 51A00FA751B91849
7 changed files with 60 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .travis.yml
  2. 30
      Jenkinsfile
  3. 25
      ci/openjdk11-mongodb-4.2/Dockerfile
  4. 25
      ci/openjdk13-mongodb-4.2/Dockerfile
  5. 25
      ci/openjdk8-mongodb-4.0/Dockerfile
  6. 25
      ci/openjdk8-mongodb-4.2/Dockerfile
  7. 14
      ci/openjdk8-mongodb-4.3/Dockerfile

2
.travis.yml
Unescape 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
Unescape 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'
} }

25
ci/openjdk11-mongodb-4.2/Dockerfile
Unescape 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; \
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 apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b ; \
RUN apt-get update 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 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 update ; \
RUN apt-get clean \ 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 ; \
&& rm -rf /var/lib/apt/lists/* apt-get clean; \
rm -rf /var/lib/apt/lists/*;

25
ci/openjdk13-mongodb-4.2/Dockerfile
Unescape 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; \
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 apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b ; \
RUN apt-get update 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 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 update ; \
RUN apt-get clean \ 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 ; \
&& rm -rf /var/lib/apt/lists/* apt-get clean; \
rm -rf /var/lib/apt/lists/*;

25
ci/openjdk8-mongodb-4.0/Dockerfile
Unescape 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; \
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 apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 ; \
RUN apt-get update 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 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 ; \
RUN apt-get clean \ 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 ; \
&& rm -rf /var/lib/apt/lists/* apt-get clean; \
rm -rf /var/lib/apt/lists/*;

25
ci/openjdk8-mongodb-4.2/Dockerfile
Unescape 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; \
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 apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b ; \
RUN apt-get update 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 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 update ; \
RUN apt-get clean \ 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 ; \
&& rm -rf /var/lib/apt/lists/* apt-get clean; \
rm -rf /var/lib/apt/lists/*;

14
ci/openjdk8-mongodb-4.3/Dockerfile
Unescape 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/*
Write Preview
Loading…
Cancel
Save