Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker image versions #17500

Merged
merged 16 commits into from
Jan 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions generators/generator-constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const LIQUIBASE_DTD_VERSION = LIQUIBASE_VERSION.split('.', 3).slice(0, 2).join('
const HIBERNATE_VERSION = '5.4.33';

const JACOCO_VERSION = '0.8.7';
const KAFKA_VERSION = '5.5.5';
const KAFKA_VERSION = '5.5.7';
const JACKSON_DATABIND_NULLABLE_VERSION = '0.2.2';

// Version of docker images
Expand All @@ -53,25 +53,25 @@ const DOCKER_JHIPSTER_CONTROL_CENTER = 'jhipster/jhipster-control-center:v0.5.0'
const DOCKER_JAVA_JRE = 'eclipse-temurin:11-jre-focal';
const DOCKER_MYSQL = 'mysql:8.0.27';
const DOCKER_MARIADB = 'mariadb:10.7.1';
const DOCKER_POSTGRESQL = 'postgres:13.5';
const DOCKER_MONGODB = 'mongo:4.4.10';
const DOCKER_POSTGRESQL = 'postgres:14.1';
const DOCKER_MONGODB = 'mongo:4.4.11';
const DOCKER_COUCHBASE = 'couchbase/server:7.0.0';
const DOCKER_CASSANDRA = 'cassandra:3.11.11';
const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU13-ubuntu-20.04';
const DOCKER_NEO4J = 'neo4j:4.3.7';
const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.2021.06';
const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU14-ubuntu-20.04';
const DOCKER_NEO4J = 'neo4j:4.4.2';
const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.2021.12-1';
const DOCKER_MEMCACHED = 'memcached:1.6.12-alpine';
const DOCKER_REDIS = 'redis:6.2.6';
const DOCKER_KEYCLOAK = 'jboss/keycloak:16.1.0'; // The version should match the attribute 'keycloakVersion' from /docker-compose/templates/realm-config/jhipster-realm.json.ejs and /server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs
const DOCKER_ELASTICSEARCH = 'docker.elastic.co/elasticsearch/elasticsearch:7.13.3'; // The version should be coherent with the one from spring-data-elasticsearch project
const DOCKER_KAFKA = `confluentinc/cp-kafka:${KAFKA_VERSION}`;
const DOCKER_ZOOKEEPER = `confluentinc/cp-zookeeper:${KAFKA_VERSION}`;
const DOCKER_SONAR = 'sonarqube:9.1.0-community';
const DOCKER_CONSUL = 'consul:1.10.4';
const DOCKER_SONAR = 'sonarqube:9.2.4-community';
const DOCKER_CONSUL = 'consul:1.11.1';
const DOCKER_CONSUL_CONFIG_LOADER = 'jhipster/consul-config-loader:v0.4.1';
const DOCKER_PROMETHEUS = 'prom/prometheus:v2.31.1';
const DOCKER_PROMETHEUS = 'prom/prometheus:v2.32.1';
const DOCKER_PROMETHEUS_ALERTMANAGER = 'prom/alertmanager:v0.23.0';
const DOCKER_GRAFANA = 'grafana/grafana:8.2.4';
const DOCKER_GRAFANA = 'grafana/grafana:8.3.3';
const DOCKER_JENKINS = 'jenkins/jenkins:lts-jdk11';
const DOCKER_SWAGGER_EDITOR = 'swaggerapi/swagger-editor:latest';
const DOCKER_PROMETHEUS_OPERATOR = 'quay.io/coreos/prometheus-operator:v0.42.1';
Expand Down
16 changes: 8 additions & 8 deletions test/__snapshots__/docker-compose.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ eureka:
- SPRING_ELASTICSEARCH_REST_URIS=http://mspsql-elasticsearch:9200
- JHIPSTER_REGISTRY_PASSWORD=admin
mspsql-postgresql:
image: postgres:13.5
image: postgres:14.1
environment:
- POSTGRES_USER=mspsql
- POSTGRES_PASSWORD=
Expand All @@ -391,7 +391,7 @@ eureka:
- SPRING_DATA_MONGODB_DATABASE=msmongodb
- JHIPSTER_REGISTRY_PASSWORD=admin
msmongodb-mongodb:
image: mongo:4.4.10
image: mongo:4.4.11

msmariadb:
image: msmariadb
Expand Down Expand Up @@ -542,7 +542,7 @@ eureka:
- SPRING_ELASTICSEARCH_REST_URIS=http://mspsql-elasticsearch:9200
- JHIPSTER_REGISTRY_PASSWORD=admin
mspsql-postgresql:
image: postgres:13.5
image: postgres:14.1
environment:
- POSTGRES_USER=mspsql
- POSTGRES_PASSWORD=
Expand All @@ -563,10 +563,10 @@ eureka:
dockerfile: mongodb/MongoDB.Dockerfile
command: mongod --shardsvr --replSet rs1
msmongodb-mongodb-config:
image: mongo:4.4.10
image: mongo:4.4.11
command: mongod --configsvr --dbpath /data/db --replSet csvr
msmongodb-mongodb:
image: mongo:4.4.10
image: mongo:4.4.11
command: mongos --configdb csvr/msmongodb-mongodb-config --bind_ip 0.0.0.0

jhipster-registry:
Expand Down Expand Up @@ -711,7 +711,7 @@ eureka:
- SPRING_ELASTICSEARCH_REST_URIS=http://mspsql-elasticsearch:9200
- JHIPSTER_REGISTRY_PASSWORD=admin
mspsql-postgresql:
image: postgres:13.5
image: postgres:14.1
environment:
- POSTGRES_USER=mspsql
- POSTGRES_PASSWORD=
Expand Down Expand Up @@ -1155,7 +1155,7 @@ eureka:
- 8761:8761

prometheus:
image: prom/prometheus:v2.31.1
image: prom/prometheus:v2.32.1
volumes:
- ./prometheus-conf/:/etc/prometheus/
- prometheus_data:/prometheus
Expand All @@ -1174,7 +1174,7 @@ eureka:
- \\"--storage.path=/alertmanager\\"

grafana:
image: grafana/grafana:8.2.4
image: grafana/grafana:8.3.3
ports:
- 3000:3000
volumes:
Expand Down
12 changes: 6 additions & 6 deletions test/__snapshots__/knative.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -9865,7 +9865,7 @@ spec:
emptyDir: {}
containers:
- name: postgres
image: postgres:13.5
image: postgres:14.1
env:
- name: POSTGRES_USER
value: mspsql
Expand Down Expand Up @@ -13199,7 +13199,7 @@ spec:
- name: workdir
mountPath: /work-dir
- name: boot
image: mongo:4.4.10
image: mongo:4.4.11
command:
- /work-dir/peer-finder
args:
Expand Down Expand Up @@ -13229,7 +13229,7 @@ spec:
mountPath: /data/db
containers:
- name: mongodb
image: mongo:4.4.10
image: mongo:4.4.11
imagePullPolicy: \\"IfNotPresent\\"
env:
- name: POD_NAMESPACE
Expand Down Expand Up @@ -13494,7 +13494,7 @@ spec:
emptyDir: {}
containers:
- name: mysql
image: mcr.microsoft.com/mssql/server:2019-CU13-ubuntu-20.04
image: mcr.microsoft.com/mssql/server:2019-CU14-ubuntu-20.04
env:
- name: MSSQL_PID
value: \\"Express\\"
Expand Down Expand Up @@ -13981,7 +13981,7 @@ spec:
emptyDir: {}
containers:
- name: postgres
image: postgres:13.5
image: postgres:14.1
env:
- name: POSTGRES_USER
value: mspsql
Expand Down Expand Up @@ -16941,7 +16941,7 @@ spec:
spec:
containers:
- name: jhipster-grafana
image: grafana/grafana:8.2.4
image: grafana/grafana:8.3.3
ports:
- containerPort: 3000
name: http
Expand Down
24 changes: 12 additions & 12 deletions test/__snapshots__/kubernetes.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ spec:
spec:
containers:
- name: kafka
image: confluentinc/cp-kafka:5.5.5
image: confluentinc/cp-kafka:5.5.7
env:
- name: KAFKA_ADVERTISED_LISTENERS
value: \\"PLAINTEXT://jhipster-kafka.default.svc.cluster.local:9092\\"
Expand Down Expand Up @@ -239,7 +239,7 @@ spec:
spec:
containers:
- name: zookeeper
image: confluentinc/cp-zookeeper:5.5.5
image: confluentinc/cp-zookeeper:5.5.7
env:
- name: ZOOKEEPER_CLIENT_PORT
value: \\"2181\\"
Expand Down Expand Up @@ -1111,7 +1111,7 @@ spec:
claimName: mspsql-postgresql-pvc
containers:
- name: postgres
image: postgres:13.5
image: postgres:14.1
env:
- name: POSTGRES_USER
value: mspsql
Expand Down Expand Up @@ -4432,7 +4432,7 @@ spec:
- name: workdir
mountPath: /work-dir
- name: boot
image: mongo:4.4.10
image: mongo:4.4.11
command:
- /work-dir/peer-finder
args:
Expand Down Expand Up @@ -4462,7 +4462,7 @@ spec:
mountPath: /data/db
containers:
- name: mongodb
image: mongo:4.4.10
image: mongo:4.4.11
imagePullPolicy: \\"IfNotPresent\\"
env:
- name: POD_NAMESPACE
Expand Down Expand Up @@ -4718,7 +4718,7 @@ spec:
claimName: msmssqldb-mssql-pvc
containers:
- name: mysql
image: mcr.microsoft.com/mssql/server:2019-CU13-ubuntu-20.04
image: mcr.microsoft.com/mssql/server:2019-CU14-ubuntu-20.04
env:
- name: MSSQL_PID
value: \\"Express\\"
Expand Down Expand Up @@ -5210,7 +5210,7 @@ spec:
claimName: mspsql-postgresql-pvc
containers:
- name: postgres
image: postgres:13.5
image: postgres:14.1
env:
- name: POSTGRES_USER
value: mspsql
Expand Down Expand Up @@ -8527,7 +8527,7 @@ spec:
spec:
containers:
- name: jhipster-grafana
image: grafana/grafana:8.2.4
image: grafana/grafana:8.3.3
ports:
- containerPort: 3000
name: http
Expand Down Expand Up @@ -10627,7 +10627,7 @@ spec:
- name: workdir
mountPath: /work-dir
- name: boot
image: mongo:4.4.10
image: mongo:4.4.11
command:
- /work-dir/peer-finder
args:
Expand Down Expand Up @@ -10657,7 +10657,7 @@ spec:
mountPath: /data/db
containers:
- name: mongodb
image: mongo:4.4.10
image: mongo:4.4.11
imagePullPolicy: \\"IfNotPresent\\"
env:
- name: POD_NAMESPACE
Expand Down Expand Up @@ -10913,7 +10913,7 @@ spec:
claimName: msmssqldb-mssql-pvc
containers:
- name: mysql
image: mcr.microsoft.com/mssql/server:2019-CU13-ubuntu-20.04
image: mcr.microsoft.com/mssql/server:2019-CU14-ubuntu-20.04
env:
- name: MSSQL_PID
value: \\"Express\\"
Expand Down Expand Up @@ -11405,7 +11405,7 @@ spec:
claimName: mspsql-postgresql-pvc
containers:
- name: postgres
image: postgres:13.5
image: postgres:14.1
env:
- name: POSTGRES_USER
value: mspsql
Expand Down
6 changes: 3 additions & 3 deletions test/__snapshots__/openshift.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2161,7 +2161,7 @@ objects:
emptyDir: {}
containers:
- name: \${APPLICATION_NAME}
image: mongo:4.4.10
image: mongo:4.4.11
env:
- name: MONGODB_DATABASE
value: \${DATABASE_NAME}
Expand Down Expand Up @@ -2897,7 +2897,7 @@ objects:
emptyDir: {}
containers:
- name: \${APPLICATION_NAME}
image: postgres:13.5
image: postgres:14.1
env:
- name: POSTGRES_DATABASE
value: \${DATABASE_NAME}
Expand Down Expand Up @@ -5089,7 +5089,7 @@ objects:
emptyDir: {}
containers:
- name: \${APPLICATION_NAME}
image: postgres:13.5
image: postgres:14.1
env:
- name: POSTGRES_DATABASE
value: \${DATABASE_NAME}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2'
services:
mspsql-postgresql:
image: postgres:13.5
image: postgres:14.1
# volumes:
# - ~/volumes/jhipster/mspsql/postgresql/:/var/lib/postgresql/
environment:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2'
services:
msmongodb-mongodb:
image: mongo:4.4.10
image: mongo:4.4.11
ports:
- "27017:27017"
command: mongos --configdb csvr/msmongodb-mongodb-config --bind_ip 0.0.0.0
Expand All @@ -11,5 +11,5 @@ services:
dockerfile: mongodb/MongoDB.Dockerfile
command: mongod --shardsvr --replSet rs1
msmongodb-mongodb-config:
image: mongo:4.4.10
image: mongo:4.4.11
command: mongod --configsvr --dbpath /data/db --replSet csvr
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2'
services:
msmongodb-mongodb:
image: mongo:4.4.10
image: mongo:4.4.11
ports:
- "27017:27017"
# volumes:
Expand Down