From b771e3d9ffdee63ef8a1c1de47aea910bed0ad74 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Thu, 12 Jun 2025 10:43:55 +0200 Subject: [PATCH] Remove unused devcontainer setup --- .devcontainer/.env | 1 - .devcontainer/Dockerfile | 10 -------- .devcontainer/devcontainer.json | 40 -------------------------------- .devcontainer/docker-compose.yml | 34 --------------------------- 4 files changed, 85 deletions(-) delete mode 100644 .devcontainer/.env delete mode 100644 .devcontainer/Dockerfile delete mode 100644 .devcontainer/devcontainer.json delete mode 100644 .devcontainer/docker-compose.yml diff --git a/.devcontainer/.env b/.devcontainer/.env deleted file mode 100644 index 91c93d91d..000000000 --- a/.devcontainer/.env +++ /dev/null @@ -1 +0,0 @@ -MAS_OAUTH2_ISSUER="https://${CODESPACE_NAME}-8080.githubpreview.dev/" \ No newline at end of file diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index 421130224..000000000 --- a/.devcontainer/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM mcr.microsoft.com/vscode/devcontainers/rust:0-1 - -RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get -y install --no-install-recommends postgresql-client - -COPY .env /.env - -# TODO: pre-build custom images, those take too much time -#RUN cargo install sqlx-cli --no-default-features --features postgres -#RUN cargo install cargo-edit \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index b063e5bd5..000000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "Rust", - "dockerComposeFile": "docker-compose.yml", - "service": "app", - "workspaceFolder": "/workspace", - - "postCreateCommand": "SQLX_OFFLINE=1 cargo run -- database migrate", - "settings": { - "lldb.executable": "/usr/bin/lldb", - "sqltools.connections": [{ - "name": "Container database", - "driver": "PostgreSQL", - "previewLimit": 50, - "server": "localhost", - "port": 5432, - "database": "postgres", - "username": "postgres", - "password": "postgres" - }], - "files.watcherExclude": { - "**/target/**": true - } - }, - - "forwardPorts": [8080], - "portsAttributes": { - "8080": { - "label": "Application" - } - }, - - "extensions": [ - "bungcip.better-toml", - "vadimcn.vscode-lldb", - "mutantdino.resourcemonitor", - "matklad.rust-analyzer", - "mtxr.sqltools", - "mtxr.sqltools-driver-pg" - ] -} diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml deleted file mode 100644 index 30c6f9e7f..000000000 --- a/.devcontainer/docker-compose.yml +++ /dev/null @@ -1,34 +0,0 @@ -version: '3' - -services: - app: - build: - context: . - dockerfile: Dockerfile - volumes: - - ..:/workspace:cached - - environment: - # FIXME: sqlx-cli and the app use different URIs - DATABASE_URL: postgresql://postgres:postgres@localhost/postgres - MAS_DATABASE_URI: postgresql://postgres:postgres@localhost/postgres - MAS_COOKIES_SECRET: a093e76c2ddc87d9de7afc1f9059d60a12176b2cdf8966029c00bc2146518a61 - - # Overrides default command so things don't shut down after the process ends. - command: sleep infinity - - # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function. - network_mode: service:db - - db: - image: postgres:latest - restart: unless-stopped - volumes: - - postgres-data:/var/lib/postgresql/data - environment: - POSTGRES_PASSWORD: postgres - POSTGRES_USER: postgres - POSTGRES_DB: postgres - -volumes: - postgres-data: \ No newline at end of file