tidy up docker compose

mazgi · Oct 22, 2022 · 728bdf1 · 728bdf1
1 parent edb8d98
commit 728bdf1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/Dockerfile.d/vscode/Dockerfile → Dockerfile.d/workspace/Dockerfile b/Dockerfile.d/vscode/Dockerfile → Dockerfile.d/workspace/Dockerfile
diff --git a/README.md b/README.md
@@ -49,8 +49,9 @@ CLOUDSDK_CORE_PROJECT=my-proj-b78e
 
 ```console
 test $(uname -s) = 'Linux' && {
- echo -e "UID=$(id -u)\nGID=$(id -g)"
  echo -e "DOCKER_GID=$(getent group docker | cut -d : -f 3)"
+ echo -e "GID=$(id -g)"
+ echo -e "UID=$(id -u)"
 } >> .env || :
 ```
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,7 +7,8 @@ x-service-provisioning-base: &provisioning-base
  context: Dockerfile.d/provisioning
  command:
  - zsh
- - -ic
+ - --login
+ - -c
  - |
  docker-util.keep-running.zsh --reset-status
  /workspace/scripts/provisioning.init-terraform-with-backend.zsh --backend=$${_TERRAFORM_BACKEND_TYPE}\
@@ -127,20 +128,26 @@ services:
  - use-only-google-cloud
 
  # for Prettier Code Formatter
- vscode:
+ # ["INFO" - 00:00:00 AM] Attempted to determine module path from /path/to/the/project
+ # ["ERROR" - 00:00:00 AM] Failed to load module. If you have prettier or plugins referenced in package.json, ensure you have run `npm install`
+ # ["ERROR" - 00:00:00 AM] Cannot find module 'prettier' from '/path/to/the/project'
+ workspace:
  build:
  args:
  GID: ${GID:-0}
  UID: ${UID:-0}
- context: Dockerfile.d/vscode
+ context: Dockerfile.d/workspace
  command:
- - bash
+ - zsh
+ - --login
  - -c
  - |
  npm-check-updates --upgrade
  npm install
  npm audit fix
  sort-package-json
+ sleep infinity
+ init: true
  user: ${UID:-0}:${GID:-0}
  volumes:
  - .:/workspace