Skip to content

Commit

Permalink
Update all images to Docker hub versions.
Browse files Browse the repository at this point in the history
Until 21.04.2022 we used quay.io/bitnami images to circumvent docker
pull limit. Unforunately, Bitnami deleted all their quay.io images on
the 20th of April, so now we use Docker hub and cashing proxy.
  • Loading branch information
fedinskiy committed Apr 21, 2022
1 parent e8ac02b commit cd93cdc
Show file tree
Hide file tree
Showing 17 changed files with 71 additions and 28 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -453,16 +453,16 @@ This might not be recommended for production, but is good enough for test.
Container images used in the tests are:

- PostgreSQL:
- version 13: `quay.io/bitnami/postgresql:13.4.0`
- version 12: `registry.redhat.io/rhscl/postgresql-12-rhel7` (only if `ts.redhat.registry.enabled` is set)
- version 13: `postgres:13.6`
- version 10: `registry.redhat.io/rhscl/postgresql-10-rhel7` (only if `ts.redhat.registry.enabled` is set)
- MySQL:
- version 5.7: `quay.io/bitnami/mysql:5.7.32`
- version 5.7: `mysql:5.7`
- version 8.0: `registry.access.redhat.com/rhscl/mysql-80-rhel7`
- MariaDB:
- version 10.6: `quay.io/quarkusqeteam/mariadb:10.6.4`
- version 10.6: `mariadb:10.6`
- MSSQL: `mcr.microsoft.com/mssql/rhel/server`
- Oracle
- version 18c XE: `gvenzl/oracle-xe:18.4.0-slim`
- version 18c XE: `gvenzl/oracle-xe:21-slim`

### `sql-db/sql-app-oracle`
Functionally identical to `sql-db/sql-app`, but using only `quarkus-jdbc-oracle` driver. This is a workaround for the missing native Oracle coverage in `sql-db/sql-app`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ public class OpenShiftWorkshopHeroesIT {
private static final int POSTGRESQL_PORT = 5432;

@Container(image = "${postgresql.13.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
static PostgresqlService database = new PostgresqlService();
static PostgresqlService database = new PostgresqlService()
//fixme https://github.com/quarkus-qe/quarkus-test-framework/issues/455
.withProperty("POSTGRES_USER", "user")
.withProperty("POSTGRES_PASSWORD", "user")
.withProperty("POSTGRES_DB", "mydb");

@GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-workshops.git", branch = "5bb433fb7a2c8d80dda88dac9dcabc50f7494dc3", contextDir = "quarkus-workshop-super-heroes/super-heroes/rest-heroes", mavenArgs = "-Dquarkus.package.type=uber-jar -DskipTests -Dquarkus.platform.group-id=${QUARKUS_PLATFORM_GROUP-ID} -Dquarkus.platform.version=${QUARKUS_VERSION}")
static final RestService app = new RestService()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ public class OpenShiftWorkshopVillainsIT {
private static final int POSTGRESQL_PORT = 5432;

@Container(image = "${postgresql.13.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
static PostgresqlService database = new PostgresqlService();
static PostgresqlService database = new PostgresqlService()
//fixme https://github.com/quarkus-qe/quarkus-test-framework/issues/455
.withProperty("POSTGRES_USER", "user")
.withProperty("POSTGRES_PASSWORD", "user")
.withProperty("POSTGRES_DB", "mydb");

@GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-workshops.git", contextDir = "quarkus-workshop-super-heroes/super-heroes/rest-villains", branch = "3d3425a15daacf1c774cb7f5bc24228c4a623256", mavenArgs = "-Dquarkus.package.type=uber-jar -DskipTests -Dquarkus.platform.group-id=${QUARKUS_PLATFORM_GROUP-ID} -Dquarkus.platform.version=${QUARKUS_VERSION}")
static final RestService app = new RestService()
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -201,20 +201,20 @@
<!-- Services used in test suite -->
<keycloak.image>quay.io/keycloak/keycloak:16.1.0</keycloak.image>
<rhsso.73.image>registry.access.redhat.com/redhat-sso-7/sso73-openshift</rhsso.73.image>
<postgresql.13.image>quay.io/bitnami/postgresql:13.5.0</postgresql.13.image>
<elastic.71.image>quay.io/bitnami/elasticsearch:7.10.2</elastic.71.image>
<mysql.57.image>quay.io/bitnami/mysql:5.7.32</mysql.57.image>
<mysql.bitnami.80.image>quay.io/bitnami/mysql:8.0</mysql.bitnami.80.image>
<postgresql.13.image>postgres:13.6</postgresql.13.image>
<elastic.71.image>elasticsearch:7.17.2</elastic.71.image>
<mysql.57.image>mysql:5.7.36</mysql.57.image>
<mysql.upstream.80.image>mysql:8.0</mysql.upstream.80.image>
<mysql.80.image>registry.access.redhat.com/rhscl/mysql-80-rhel7</mysql.80.image>
<mariadb.10.image>mariadb:10.6</mariadb.10.image>
<mariadb.102.image>registry.access.redhat.com/rhscl/mariadb-102-rhel7</mariadb.102.image>
<mssql.image>mcr.microsoft.com/mssql/rhel/server:2019-latest</mssql.image>
<oracle.image>gvenzl/oracle-xe:21-slim</oracle.image>
<db2.image>quay.io/quarkusqeteam/db2:11.5.7.0</db2.image>
<mongodb.image>quay.io/bitnami/mongodb:5.0</mongodb.image>
<redis.image>quay.io/bitnami/redis:6.0</redis.image>
<mongodb.image>mongo:5.0</mongodb.image>
<redis.image>redis:6.0</redis.image>
<wiremock.image>quay.io/ocpmetal/wiremock</wiremock.image>
<consul.image>quay.io/bitnami/consul:1.11.2</consul.image>
<consul.image>consul:1.11</consul.image>
<infinispan.image>quay.io/infinispan/server:12.1</infinispan.image>
<infinispan.expected-log>Infinispan Server.*started in</infinispan.expected-log>
<spring.cloud.server.image>quay.io/quarkusqeteam/spring-cloud-config-server:3.0</spring.cloud.server.image>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ public class AbstractDbIT {
static final int POSTGRESQL_PORT = 5432;

@Container(image = "${postgresql.13.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
static final PostgresqlService database = new PostgresqlService();
static final PostgresqlService database = new PostgresqlService()
//fixme https://github.com/quarkus-qe/quarkus-test-framework/issues/455
.withProperty("POSTGRES_USER", "user")
.withProperty("POSTGRES_PASSWORD", "user")
.withProperty("POSTGRES_DB", "mydb");

@QuarkusApplication
public static final RestService app = new RestService()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ public class MysqlMultitenantHibernateIT extends AbstractMultitenantIT {
static final int ELASTIC_PORT = 9200;
static final int MYSQL_PORT = 3306;

@Container(image = "${mysql.bitnami.80.image}", port = MYSQL_PORT, expectedLog = "ready for connections")
@Container(image = "${mysql.upstream.80.image}", port = MYSQL_PORT, expectedLog = "ready for connections")
static MySqlService base = new MySqlService().withDatabase("base");

@Container(image = "${mysql.bitnami.80.image}", port = MYSQL_PORT, expectedLog = "ready for connections")
@Container(image = "${mysql.upstream.80.image}", port = MYSQL_PORT, expectedLog = "ready for connections")
static MySqlService company1 = new MySqlService().withDatabase("company1");

@Container(image = "${mysql.bitnami.80.image}", port = MYSQL_PORT, expectedLog = "ready for connections")
@Container(image = "${mysql.upstream.80.image}", port = MYSQL_PORT, expectedLog = "ready for connections")
static MySqlService company2 = new MySqlService().withDatabase("company2");;

@Container(image = "${elastic.71.image}", port = ELASTIC_PORT, expectedLog = "started")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ public class PostgresqlMultitenantHibernateIT extends AbstractMultitenantIT {
static DefaultService elastic = new DefaultService().withProperty("discovery.type", "single-node");

@Container(image = "${postgresql.13.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
static PostgresqlService database = new PostgresqlService();
static PostgresqlService database = new PostgresqlService()
//fixme https://github.com/quarkus-qe/quarkus-test-framework/issues/455
.withProperty("POSTGRES_USER", "user")
.withProperty("POSTGRES_PASSWORD", "user")
.withProperty("POSTGRES_DB", "mydb");

@QuarkusApplication
static RestService app = new RestService()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ public class PostgresqlDatabaseIT extends AbstractReactiveDatabaseIT {

@Container(image = "${postgresql.13.image}", port = POSTGRES_PORT, expectedLog = "listening on IPv4 address")
static PostgresqlService database = new PostgresqlService()
//fixme https://github.com/quarkus-qe/quarkus-test-framework/issues/455
.withProperty("POSTGRES_USER", POSTGRES_USER)
.withProperty("POSTGRES_PASSWORD", POSTGRES_PASSWORD)
.withProperty("POSTGRES_DB", POSTGRES_DATABASE)
.withUser(POSTGRES_USER)
.withPassword(POSTGRES_PASSWORD)
.withDatabase(POSTGRES_DATABASE);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ public class ProdHibernateIT extends BaseHibernateIT {
static final int POSTGRESQL_PORT = 5432;

@Container(image = "${postgresql.13.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
static final PostgresqlService database = new PostgresqlService();
static final PostgresqlService database = new PostgresqlService()
//fixme https://github.com/quarkus-qe/quarkus-test-framework/issues/455
.withProperty("POSTGRES_USER", "user")
.withProperty("POSTGRES_PASSWORD", "user")
.withProperty("POSTGRES_DB", "mydb");

@QuarkusApplication
public static final RestService app = new RestService()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ public class MultiplePersistenceIT extends AbstractMultiplePersistenceIT {
static MariaDbService mariadb = new MariaDbService();

@Container(image = "${postgresql.13.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
static PostgresqlService postgresql = new PostgresqlService();
static PostgresqlService postgresql = new PostgresqlService()
//fixme https://github.com/quarkus-qe/quarkus-test-framework/issues/455
.withProperty("POSTGRES_USER", "user")
.withProperty("POSTGRES_PASSWORD", "user")
.withProperty("POSTGRES_DB", "mydb");

@QuarkusApplication
static RestService app = new RestService()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ public class OpenShiftMultiplePersistenceIT extends AbstractMultiplePersistenceI
static MariaDbService mariadb = new MariaDbService();

@Container(image = "${postgresql.13.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
static PostgresqlService postgresql = new PostgresqlService();
static PostgresqlService postgresql = new PostgresqlService()
//fixme https://github.com/quarkus-qe/quarkus-test-framework/issues/455
.withProperty("POSTGRES_USER", "user")
.withProperty("POSTGRES_PASSWORD", "user")
.withProperty("POSTGRES_DB", "mydb");

@QuarkusApplication
static RestService app = new RestService()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class MySqlDatabaseIT extends AbstractSqlDatabaseIT {

static final int MYSQL_PORT = 3306;

@Container(image = "${mysql.57.image}", port = MYSQL_PORT, expectedLog = "ready for connections")
@Container(image = "${mysql.57.image}", port = MYSQL_PORT, expectedLog = "port: " + MYSQL_PORT)
static MySqlService database = new MySqlService();

@QuarkusApplication
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ public class OpenShiftPostgresql13DatabaseIT extends AbstractSqlDatabaseIT {
static final int POSTGRESQL_PORT = 5432;

@Container(image = "${postgresql.13.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
static PostgresqlService database = new PostgresqlService();
static PostgresqlService database = new PostgresqlService()
//fixme https://github.com/quarkus-qe/quarkus-test-framework/issues/455
.withProperty("POSTGRES_USER", "user")
.withProperty("POSTGRES_PASSWORD", "user")
.withProperty("POSTGRES_DB", "mydb");

@QuarkusApplication
static RestService app = new RestService().withProperties("postgresql.properties")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ public class Postgresql13DatabaseIT extends AbstractSqlDatabaseIT {
static final int POSTGRESQL_PORT = 5432;

@Container(image = "${postgresql.13.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
static PostgresqlService database = new PostgresqlService();
static PostgresqlService database = new PostgresqlService()
//fixme https://github.com/quarkus-qe/quarkus-test-framework/issues/455
.withProperty("POSTGRES_USER", "user")
.withProperty("POSTGRES_PASSWORD", "user")
.withProperty("POSTGRES_DB", "mydb");

@QuarkusApplication
static RestService app = new RestService().withProperties("postgresql.properties")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class PostgresqlResource implements QuarkusTestResourceLifecycleManager {

@Override
public Map<String, String> start() {
postgresContainer = new GenericContainer<>(DockerImageName.parse("quay.io/bitnami/postgresql:13.4.0"))
postgresContainer = new GenericContainer<>(DockerImageName.parse("postgres:13.6"))
.withEnv("POSTGRES_USER", "test")
.withEnv("POSTGRES_PASSWORD", "test")
.withEnv("POSTGRES_DB", "amadeus")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ public class PostgresqlHandlerIT extends CommonTestCases {

@Container(image = "${postgresql.13.image}", port = 5432, expectedLog = "listening on IPv4 address")
static PostgresqlService postgres = new PostgresqlService()
.with("test", "test", POSTGRESQL_DATABASE);
.with("test", "test", POSTGRESQL_DATABASE)
.withProperty("POSTGRES_USER", "test") //fixme https://github.com/quarkus-qe/quarkus-test-framework/issues/455
.withProperty("POSTGRES_PASSWORD", "test")
.withProperty("POSTGRES_DB", POSTGRESQL_DATABASE);;

@QuarkusApplication
static final RestService app = new RestService()
Expand Down
2 changes: 1 addition & 1 deletion sql-db/vertx-sql/src/test/resources/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
POSTGRES_DB: amadeus

mysql:
image: quay.io/bitnami/mysql:5.7.32
image: mysql:5.7
hostname: mysql
container_name: mysql
ports:
Expand Down

0 comments on commit cd93cdc

Please sign in to comment.