Skip to content

Commit fd9838d

Browse files
committed
fix devcontainer json and switch base
1 parent b48ed12 commit fd9838d

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM ghcr.io/ffalor/puppet:main
1+
FROM docker.io/puppet/pdk:latest
22

33
RUN apt-get update

.devcontainer/devcontainer.json

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
{
22
"name": "Puppet Agent, PDK, Bolt",
3-
"dockerFile": "Dockerfile",
4-
// Add the IDs of extensions you want installed when the container is created.
5-
"extensions": [
6-
"puppet.puppet-vscode",
7-
"misogi.ruby-rubocop",
8-
"castwide.solargraph"
9-
],
10-
"settings": {
11-
"[ruby]": {
12-
"editor.defaultFormatter": "misogi.ruby-rubocop"
13-
},
14-
"ruby.rubocop.suppressRubocopWarnings": true,
3+
"build": {
4+
"dockerfile": "Dockerfile"
5+
},
6+
"customizations": {
7+
"vscode": {
8+
"extensions": [
9+
"puppet.puppet-vscode",
10+
"misogi.ruby-rubocop",
11+
"castwide.solargraph"
12+
],
13+
"settings": {
14+
"[ruby]": {
15+
"editor.defaultFormatter": "rebornix.ruby"
16+
},
17+
"ruby.rubocop.suppressRubocopWarnings": true
18+
}
19+
}
1520
},
1621
"features": {
1722
"docker-in-docker": {
@@ -20,7 +25,7 @@
2025
"sshd": "latest"
2126
},
2227
"mounts": [
23-
"source=${localWorkspaceFolder},target=/etc/puppetlabs/code/environments/production/modules/falcon,type=bind,consistency=cached",
28+
"source=${localWorkspaceFolder},target=/etc/puppetlabs/code/environments/production/modules/falcon,type=bind,consistency=cached"
2429
],
2530
"postStartCommand": "pdk bundle install"
2631
}

0 commit comments

Comments
 (0)