Skip to content

Commit

Permalink
used private docker image
Browse files Browse the repository at this point in the history
  • Loading branch information
KushnirykOleh committed Aug 22, 2024
1 parent c7b33ce commit 229cf70
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 25 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"snapshot": {
"objects": {
"liquibase.structure.core.View": [
{
"view": {
"definition": "SELECT id,\n first_name,\n last_name,\n email\n FROM authors;",
"name": "test_view"
}
}]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"snapshot": {
"objects": {
"liquibase.structure.core.View": [
{
"view": {
"definition": "SELECT id,\n first_name,\n last_name,\n email\n FROM authors;",
"name": "test_view"
}
}]
}
}
}
2 changes: 1 addition & 1 deletion src/test/resources/docker/create-infra.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ case $db in
;;

# edb setup requires login to private registry
"edb-postgres-12"|"edb-postgres-13"|"edb-postgres-14"|"edb-postgres-15"|"edb-edb-12"|"edb-edb-13"|"edb-edb-14"|"edb-edb-15")
"edb-postgres-12"|"edb-postgres-13"|"edb-postgres-14"|"edb-postgres-15"|"edb-postgres-16"|"edb-edb-12"|"edb-edb-13"|"edb-edb-14"|"edb-edb-15"|"edb-edb-16")
docker login $REPO_URL -u $REPO_USER -p $REPO_PASSWORD
docker compose -f docker-compose.edb.yml up -d $db
exit 0
Expand Down
12 changes: 12 additions & 0 deletions src/test/resources/docker/docker-compose.edb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ services:
- "5508:5444"
restart: always

edb-postgres-16:
image: docker.liquibase.net/datical-enterprisedb-edbas16
ports:
- "5509:5444"
restart: always

# We are providing second set of EDB images to run tests with EDB driver
# Without it tests will run in parallel and interfere with each other

Expand All @@ -55,4 +61,10 @@ services:
image: docker.liquibase.net/datical-enterprisedb-edbas15:latest
ports:
- "5515:5444"
restart: always

edb-edb-16:
image: docker.liquibase.net/datical-enterprisedb-edbas16
ports:
- "5516:5444"
restart: always
22 changes: 0 additions & 22 deletions src/test/resources/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,28 +131,6 @@ services:
volumes:
- "./postgres-init.sh:/docker-entrypoint-initdb.d/postgres-init.sh"

edb-postgres-16:
image: ghcr.io/enterprisedb/postgresql:16
ports:
- "5509:5432"
restart: always
environment:
POSTGRES_PASSWORD: LbRootPass1
POSTGRES_DB: lbcat
volumes:
- "./postgres-init.sh:/docker-entrypoint-initdb.d/postgres-init.sh"

edb-edb-16:
image: ghcr.io/enterprisedb/postgresql:16
ports:
- "5510:5432"
restart: always
environment:
POSTGRES_PASSWORD: LbRootPass1
POSTGRES_DB: lbcat
volumes:
- "./postgres-init.sh:/docker-entrypoint-initdb.d/postgres-init.sh"

mariadb-10.2:
image: mariadb:10.2
ports:
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/docker/teardown-infra.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ db=$1

case $db in
# edb specific teardown
"edb-postgres-12"|"edb-postgres-13"|"edb-postgres-14"|"edb-postgres-15"|"edb-edb-12"|"edb-edb-13"|"edb-edb-14"|"edb-edb-15")
"edb-postgres-12"|"edb-postgres-13"|"edb-postgres-14"|"edb-postgres-15"|"edb-postgres-16"|"edb-edb-12"|"edb-edb-13"|"edb-edb-14"|"edb-edb-15"|"edb-edb-16")
docker compose -f docker-compose.edb.yml down --volumes
exit 0
;;
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/harness-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ databasesUnderTest:
- name: edb-edb
prefix: docker
version: 16
url: jdbc:edb://localhost:5510/lbcat
url: jdbc:edb://localhost:5516/lbcat
username: lbuser
password: LiquibasePass1

Expand Down

0 comments on commit 229cf70

Please sign in to comment.