Skip to content

Commit 938259c

Browse files
committed
update devcontainer build
1 parent 3f976a6 commit 938259c

File tree

4 files changed

+13
-30
lines changed

4 files changed

+13
-30
lines changed

.devcontainer/ansible/roles/setup-container/tasks/ssh.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
- name: et permissions on ~/.ssh
1+
- name: Set permissions on ~/.ssh
22
file:
3-
path: "{{ lookup('env', 'HOME') + '/.ssh' }}"
3+
path: "'~/.ssh' }}"
44
state: directory
55
owner: "{{ lookup('env', 'USER') }}"
66
group: "{{ lookup('env', 'USER') }}"
77
recurse: true
88
mode: '0700'
9+
become: true
910

1011
- name: Set permissions for ~/.ssh files
12+
1113
file:
1214
path: "{{ item }}"
1315
mode: '0600'
1416
owner: "{{ lookup('env', 'USER') }}"
1517
group: "{{ lookup('env', 'USER') }}"
18+
become: true
1619
with_fileglob:
17-
- "{{ lookup('env', 'HOME') }}/.ssh/*"
20+
- "~/.ssh/*"
1821

1922
- name: Setup and start ssh-agent
2023
shell: |

.devcontainer/ansible/setup-container.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@
33
hosts: localhost
44
connection: local
55
gather_facts: true
6-
vars:
7-
# docker defaults
8-
docker_edition: 'ce'
9-
docker_package_state: present
10-
docker_service_manage: false
11-
docker_install_compose_plugin: true
12-
docker_compose_package: docker-compose-plugin
13-
docker_compose_package_state: present
14-
15-
docker_users:
16-
- "{{ lookup('env', 'USER') }}"
6+
ignore_errors: true
177
roles:
188
- role: setup-container

.devcontainer/devcontainer.json

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,10 @@
5151
"ms-python.isort"
5252
],
5353
"settings": {
54-
"[python]": {
55-
"editor.defaultFormatter": "ms-python.black-formatter",
56-
"editor.detectIndentation": false,
57-
"editor.insertSpaces": false,
58-
"editor.tabSize": 2
59-
},
60-
"files.exclude": {
61-
"**/.dotnet": true,
62-
"**/.zcompdump": true
63-
},
6454
"dev.containers.copyGitConfig": false,
6555
"dev.containers.gitCredentialHelperConfigLocation": "system",
66-
"editor.tabSize": 2,
6756
"files.readonlyFromPermissions": true,
6857
"python.analysis.extraPaths": [ "${containerWorkspaceFolder}/app" ],
69-
"terminal.external.windowsExec": "C:\\Program Files\\PowerShell\\7\\pwsh.exe",
7058
"terminal.integrated.defaultProfile.linux": "zsh",
7159
"terminal.integrated.defaultProfile.windows": "pwsh",
7260
"terminal.integrated.profiles.linux": {
@@ -88,7 +76,7 @@
8876
},
8977
"terminal.integrated.tabs.description": "",
9078
"terminal.integrated.tabs.title": "${local}${separator}${cwdFolder}${separator}${process}",
91-
"window.title": "${localWorkspaceFolderBasename}"
79+
"window.title": "${localWorkspaceFolderBasename} ${process}"
9280
}
9381
}
9482
}

Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
169169
echo ${USER} ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/${USER} && \
170170
chmod 0440 /etc/sudoers.d/${USER}
171171

172+
COPY .devcontainer .devcontainer
173+
174+
RUN LC_ALL=C.UTF-8 ansible-playbook --inventory 127.0.0.1 --connection=local .devcontainer/ansible/requirements.yml && \
175+
LC_ALL=C.UTF-8 ansible-playbook --inventory 127.0.0.1 --connection=local .devcontainer/ansible/install-docker.yml
176+
172177
RUN apt-get update && apt-get install -y --no-install-recommends \
173178
graphviz \
174179
imagemagick \
@@ -192,9 +197,6 @@ RUN pip3 install --no-cache-dir --target=${PYTHON_DEPS_PATH} --no-deps --prefer-
192197
RUN pip3 install --no-cache-dir --target=${PYTHON_DEPS_PATH} --prefer-binary pandas-datareader bottleneck scipy duckdb sqlalchemy pyautogui requests_cache statsmodels
193198
#RUN pip3 install --no-cache-dir --target=${PYTHON_DEPS_PATH} gensim torch tensorflow
194199

195-
RUN LC_ALL=C.UTF-8 ansible-playbook --inventory 127.0.0.1 --connection=local .devcontainer/ansible/requirements.yml && \
196-
LC_ALL=C.UTF-8 ansible-playbook --inventory 127.0.0.1 --connection=local .devcontainer/ansible/install-docker.yml
197-
198200
USER ${USER}
199201

200202
# https://code.visualstudio.com/remote/advancedcontainers/start-processes#_adding-startup-commands-to-the-docker-image-instead

0 commit comments

Comments
 (0)