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.

Sign up for GitHub

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 DB drivers and base images #61

Merged
merged 1 commit into from
Apr 26, 2023
Merged

Update DB drivers and base images #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Security
- Update DB drivers and test base images
[conjurdemos/pet-store-demo#61](https://github.com/conjurdemos/pet-store-demo/pull/61)

## [1.2.1] - 2023-04-24

### Security
Expand Down
6 changes: 1 addition & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,9 @@
<version>8.0.30</version>
</dependency>
<dependency>
<!-- TODO: Bumping this to 11.2.1.jre11 causes the MSSQL tests to
fail. No error message was given, but it looks like it's a time out
issue. There's something in the major version updates that's breaking.
We need to investigate what that is. -->
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>9.4.1.jre11</version>
<version>12.2.0.jre11</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
6 changes: 3 additions & 3 deletions test/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
DB_PASSWORD: yourStrong()Password

postgres:
image: postgres:9.6
image: postgres:15.2-alpine
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"]
timeout: 10s
Expand All @@ -20,7 +20,7 @@ services:
POSTGRES_PASSWORD: yourStrong()Password

mysql:
image: mysql/mysql-server:5.7
image: mysql/mysql-server:8.0
healthcheck:
test: ["CMD-SHELL", "mysqladmin ping"]
timeout: 10s
Expand All @@ -32,7 +32,7 @@ services:
MYSQL_PASSWORD: yourStrong()Password

mssql:
image: mcr.microsoft.com/mssql/server:2017-latest
image: mcr.microsoft.com/mssql/server:2022-latest
healthcheck:
test: ["CMD-SHELL", "mssql-health-check"]
timeout: 10s
Expand Down
4 changes: 2 additions & 2 deletions test/test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ postgres) export DB_PLATFORM=postgres
export DB_USERNAME=postgres
;;
mysql) export DB_PLATFORM=mysql
export DB_URL=mysql://mysql:3306/mysql?useSSL=false
export DB_URL="mysql://mysql:3306/mysql?useSSL=false&allowPublicKeyRetrieval=true"
export DB_USERNAME=mysql
;;
mssql) export DB_PLATFORM=mssql
export DB_URL=sqlserver://mssql:1433;databaseName=tempdb
export DB_URL="sqlserver://mssql:1433;databaseName=tempdb;trustServerCertificate=true"
export DB_USERNAME=sa
;;
*) echo "DATABASE_TYPE $1 is not supported"
Expand Down