Skip to content

Commit

Permalink
fix mysql integration: pin latest, remove command, remove unused dock…
Browse files Browse the repository at this point in the history
…er compose config (#5070)
  • Loading branch information
thingscouldbeworse authored Jul 10, 2024
1 parent 36e2c50 commit ad3ae40
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 18 deletions.
18 changes: 2 additions & 16 deletions docker-compose.integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,6 @@ services:
ports:
- "0.0.0.0:6432:5432"

mysql-test:
image: mysql:8
platform: linux/amd64
command: --mysql-native-password=ON
restart: always
environment:
- MYSQL_HOST=mysql_example
- MYSQL_DATABASE=mysql_example
- MYSQL_ROOT_PASSWORD=example
- MYSQL_USER=mysql_user
- MYSQL_PASSWORD=mysql_pw
expose:
- 3306
ports:
- "3306:3306"

sqlserver-test:
image: mcr.microsoft.com/azure-sql-edge:latest # Equivalent to SQL Server 2016
environment:
Expand All @@ -47,3 +31,5 @@ services:
- 1433
ports:
- "0.0.0.0:1433:1433"

# mysql integration test config lives at `docker/docker-compose.integration-mysql.yml`
3 changes: 1 addition & 2 deletions docker/docker-compose.integration-mysql.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
services:
mysql_example:
image: mysql
image: mysql:latest
platform: linux/amd64
command: --mysql-native-password=ON
restart: always
environment:
- MYSQL_HOST=mysql_example
Expand Down

0 comments on commit ad3ae40

Please sign in to comment.