Skip to content

Commit 9c903f1

Browse files
committed
misc: improve devcontainer environment setup
- Legacy-Id: 19481
1 parent fe502da commit 9c903f1

4 files changed

Lines changed: 7 additions & 14 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// Set *default* container specific settings.json values on container create.
1212
"settings": {
13+
"terminal.integrated.defaultProfile.linux": "zsh",
1314
"python.pythonPath": "/usr/local/bin/python",
1415
"python.languageServer": "Pylance",
1516
"python.linting.enabled": true,
@@ -35,6 +36,7 @@
3536
"-p",
3637
"test*.py"
3738
]
39+
// "python.envFile": "${workspaceFolder}/.devcontainer/dev.env"
3840
},
3941

4042
// Add the IDs of extensions you want installed when the container is created.
@@ -46,11 +48,10 @@
4648
"redhat.vscode-yaml",
4749
"visualstudioexptteam.vscodeintellicode",
4850
"batisteo.vscode-django",
49-
"littlefoxteam.vscode-python-test-adapter"
5051
],
5152

5253
// Use 'forwardPorts' to make a list of ports inside the container available locally.
53-
"forwardPorts": [8000, 3306],
54+
"forwardPorts": [8000, 3306]
5455

5556
// Use 'postCreateCommand' to run commands after the container is created.
5657
// "postCreateCommand": "sh /docker-init.sh",

.devcontainer/docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ services:
2929
UID: 1001
3030
GID: 1001
3131
DATADIR: data
32+
# DJANGO_SETTINGS_MODULE: settings_sqlitetest
3233

3334
# Uncomment the next line to use a non-root user for all processes.
3435
# user: vscode

.devcontainer/init.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ if [ ! -f $VIRTDIR/bin/activate ]; then
7575
# datatracker virtual python environment on docker container entry:
7676
" >> /etc/bash.bashrc
7777
cat $VIRTDIR/bin/activate >> /etc/bash.bashrc
78-
cat /usr/local/share/datatracker/setprompt >> /etc/bash.bashrc
78+
cat /usr/local/share/datatracker/docker/setprompt >> /etc/bash.bashrc
7979
else
8080
echo "Using virtual environment at $VIRTDIR"
8181
fi
@@ -151,6 +151,8 @@ fi
151151

152152
HOME=/opt/home/$USER
153153

154+
/usr/local/bin/python $WORKSPACEDIR/ietf/manage.py check --settings=settings_local
155+
154156
# su -p $USER
155157

156158
exec "$@"

.vscode/settings.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)