diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 18fd3dc8da..75a2faa492 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,24 +3,14 @@ // Update the VARIANT arg in docker-compose.yml to pick a Python version { "name": "sqlc", - "dockerComposeFile": "docker-compose.yml", - "service": "app", - "workspaceFolder": "/workspace", + "build": { + "dockerfile": "Dockerfile" + }, "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], // Set *default* container specific settings.json values on container create. "settings": { - "sqltools.connections": [{ - "name": "Container database", - "driver": "PostgreSQL", - "previewLimit": 50, - "server": "postgresql", - "port": 5432, - "database": "dinotest", - "username": "postgres", - "password": "mysecretpassword" - }], "go.toolsManagement.checkForUpdates": "local", "go.useLanguageServer": true, "go.gopath": "/go", @@ -30,9 +20,6 @@ // Add the IDs of extensions you want installed when the container is created. "extensions": [ "golang.Go", - "mtxr.sqltools", - "mtxr.sqltools-driver-pg", - "mtxr.sqltools-driver-mysql" ], // Use 'forwardPorts' to make a list of ports inside the container available locally. diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml deleted file mode 100644 index 5c731784db..0000000000 --- a/.devcontainer/docker-compose.yml +++ /dev/null @@ -1,50 +0,0 @@ -version: '3.8' - -services: - app: - build: - context: .. - dockerfile: .devcontainer/Dockerfile - args: - VARIANT: 1.19-bullseye - - volumes: - - ..:/workspace:cached - - # Overrides default command so things don't shut down after the process ends. - command: sleep infinity - - links: - - mysql - - postgresql - - environment: - PG_HOST: postgresql - PG_USER: postgres - PG_DATABASE: dinotest - PG_PASSWORD: mysecretpassword - MYSQL_DATABASE: dinotest - MYSQL_HOST: mysql - MYSQL_ROOT_PASSWORD: mysecretpassword - - mysql: - image: "mysql/mysql-server:8.0" - ports: - - "3306:3306" - restart: unless-stopped - environment: - MYSQL_DATABASE: dinotest - MYSQL_ROOT_PASSWORD: mysecretpassword - MYSQL_ROOT_HOST: '%' - - postgresql: - image: "postgres:13" - ports: - - "5432:5432" - restart: unless-stopped - environment: - POSTGRES_DB: dinotest - POSTGRES_PASSWORD: mysecretpassword - POSTGRES_USER: postgres - # Add "forwardPorts": ["5432"] to **devcontainer.json** to forward PostgreSQL locally. - # (Adding the "ports" property to this file will not forward from a Codespace.)