diff --git a/.devcontainer/compose.yml b/.devcontainer/compose.yml index 6e244406..f42eb07a 100644 --- a/.devcontainer/compose.yml +++ b/.devcontainer/compose.yml @@ -1,7 +1,7 @@ version: '3.7' services: # Update this to the name of the service you want to work with in your docker-compose.yml file - app: + multi-scrobbler: # Uncomment if you want to override the service's Dockerfile to one in the .devcontainer # folder. Note that the path of the Dockerfile and context is relative to the *primary* # docker-compose.yml file (the first in the devcontainer.json "dockerComposeFile" diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index db7d1055..62d25be3 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,9 +5,11 @@ // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile "dockerComposeFile": [ "compose.yml" + // uncomment to add kasm/discord service + //"../deploy/docker-compose.discord.yml" ], - "service": "app", + "service": "multi-scrobbler", "workspaceFolder": "/workspaces", diff --git a/.dockerignore b/.dockerignore index 2fe0731a..671786f7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -27,4 +27,5 @@ build .vscode **/act/* tmp-* -.env \ No newline at end of file +.env +*.env \ No newline at end of file diff --git a/.gitignore b/.gitignore index b0a52c59..1d09367d 100644 --- a/.gitignore +++ b/.gitignore @@ -73,6 +73,7 @@ web_modules/ # dotenv environment variables file .env .env.test +*.env # parcel-bundler cache (https://parceljs.org/) .cache diff --git a/deploy/docker-compose.discord.yml b/deploy/docker-compose.discord.yml new file mode 100644 index 00000000..4ffe593e --- /dev/null +++ b/deploy/docker-compose.discord.yml @@ -0,0 +1,26 @@ +services: + multi-scrobbler: + volumes: + - kasm_run:/run + kasmcord: + container_name: kasmcord + image: kasmweb/discord:1.14.0 + ports: + # VNC port to use in web browser + - 6901:6901 + shm_size: 512m + environment: + # set a password for VNC access + VNC_PW: ${KASM_PW:-hunter2} + XDG_RUNTIME_DIR: /run/user/1000 + volumes: + - kasm_run:/run/user/1000 + - kasm_config:/home/kasm-user/.config + user: "0" + entrypoint: sh -c "chmod 700 /run/user/1000 && chown -R kasm-user:kasm-user /run/user/1000 && chown -R kasm-user:kasm-user /home/kasm-user/.config && su kasm-user -c '/dockerstartup/kasm_default_profile.sh /dockerstartup/vnc_startup.sh /dockerstartup/kasm_startup.sh'" + +volumes: + kasm_run: + name: kasm_run + kasm_config: + name: kasm_config \ No newline at end of file