diff --git a/docker/devenv/docker-compose.yaml b/docker/devenv/docker-compose.yaml index e81fabf9c..d7b5da48a 100644 --- a/docker/devenv/docker-compose.yaml +++ b/docker/devenv/docker-compose.yaml @@ -1,5 +1,3 @@ -version: "3" - networks: default: driver: bridge diff --git a/docker/devenv/files/bashrc b/docker/devenv/files/bashrc index 6dcc66f19..f7540b67b 100644 --- a/docker/devenv/files/bashrc +++ b/docker/devenv/files/bashrc @@ -1,5 +1,10 @@ #!/usr/bin/env bash +export JAVA_OPTS=${JAVA_OPTS:-"-Xmx1000m -Xms200m"}; +export PATH=/usr/lib/jvm/openjdk/bin:/usr/local/nodejs/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin +EMSDK_QUIET=1 . /usr/local/emsdk/emsdk_env.sh; +source /usr/local/cargo/env + alias l='ls --color -GFlh' alias rm='rm -r' alias ls='ls --color -F' diff --git a/docker/devenv/files/entrypoint.sh b/docker/devenv/files/entrypoint.sh index e65b458a3..975494219 100755 --- a/docker/devenv/files/entrypoint.sh +++ b/docker/devenv/files/entrypoint.sh @@ -1,12 +1,5 @@ #!/usr/bin/env bash -export PATH=/usr/lib/jvm/openjdk/bin:/usr/local/nodejs/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin - -source /usr/local/emsdk/emsdk_env.sh; -source /usr/local/cargo/env - -export JAVA_OPTS=${JAVA_OPTS:-"-Xmx1000m -Xms200m"}; - set -e usermod -u ${EXTERNAL_UID:-1000} penpot