Skip to content

Commit

Permalink
modified: .devcontainer/devcontainer.json
Browse files Browse the repository at this point in the history
	modified:   .devcontainer/docker-compose-vscode.yml
  • Loading branch information
jwillmartin committed Jun 5, 2024
1 parent ce01ea9 commit 589e932
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
// Docker Compose syntax from https://github.com/devcontainers/templates/blob/main/src/docker-existing-docker-compose/.devcontainer/devcontainer.json
// and https://github.com/microsoft/vscode-dev-containers/blob/main/container-templates/docker-compose/.devcontainer/devcontainer.json
"name": "V2XHUB Docker Compose Dev",
"name": "V2X Hub Docker Compose Dev",

// Update the 'dockerComposeFile' list if you have more compose files or use different names.
"dockerComposeFile": "docker-compose-vscode.yml",
Expand Down
4 changes: 2 additions & 2 deletions .devcontainer/docker-compose-vscode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ services:
- mysql_password

db:
image: mysql:5.7
image: mysql:8.0
container_name: mysql
restart: always
environment:
Expand All @@ -42,7 +42,7 @@ services:
- mysql_password
- mysql_root_password
volumes:
- ../configuration/amd64/mysql/localhost.sql:/docker-entrypoint-initdb.d/localhost.sql
- ../configuration/mysql/localhost.sql:/docker-entrypoint-initdb.d/localhost.sql
# include creation of a user (user/user) to be able to log in
- ./mysql_add_dev_user.sql:/docker-entrypoint-initdb.d/mysql_add_dev_user.sql
- mysql-datavolume:/var/lib/mysql
Expand Down

0 comments on commit 589e932

Please sign in to comment.