Skip to content

Commit

Permalink
Merge pull request #488 from Azure/AL-5.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
arnaudlh committed Aug 4, 2023
2 parents 8e04113 + cec42df commit 71c71e4
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 23 deletions.
26 changes: 12 additions & 14 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "Azure CAF landing zones",
"name": "Azure platform engineering",

// Update the 'dockerComposeFile' list if you have more compose files or use different names.
"dockerComposeFile": "docker-compose.yml",
Expand All @@ -15,14 +15,6 @@
// connected. This is typically a volume mount in .devcontainer/docker-compose.yml
"workspaceFolder": "/tf/caf",

// Use 'settings' to set *default* container specific settings.json values on container create.
// You can edit these settings after create using File > Preferences > Settings > Remote.
"settings": {
"files.eol": "\n",
"editor.tabSize": 2,
"terminal.integrated.scrollback": 64000,
},

// Uncomment the next line if you want start specific services in your Docker Compose config.
// "runServices": [],

Expand All @@ -31,10 +23,16 @@

// Uncomment the next line to run commands after the container is created.
"postCreateCommand": "sudo cp -R /tmp/.ssh-localhost/* ~/.ssh && sudo chown -R $(whoami):$(whoami) /tf/caf ~/.ssh && sudo chmod 400 ~/.ssh/* && git config --global core.editor vim && pre-commit install && pre-commit autoupdate",

// Add the IDs of extensions you want installed when the container is created in the array below.
"extensions": [
"4ops.terraform",
"mutantdino.resourcemonitor"
]
"customizations": {
"vscode": {
"extensions": [
"hashicorp.terraform",
"mutantdino.resourcemonitor",
"eamodio.gitlens",
"GitHub.copilot"
]
}
}
}
2 changes: 1 addition & 1 deletion .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
version: '3.7'
services:
rover:
image: aztfmod/rover:1.4.6-2307.0508
image: aztfmod/rover:1.5.4-2307.2804
user: vscode

labels:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/landingzones-tf100.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
random_length: ['5']

container:
image: aztfmod/rover:1.4.6-2307.0508
image: aztfmod/rover:1.5.4-2307.2804
options: --user 0

steps:
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
]

container:
image: aztfmod/rover:1.4.6-2307.0508
image: aztfmod/rover:1.5.4-2307.2804
options: --user 0

steps:
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
random_length: ['5']

container:
image: aztfmod/rover:1.4.6-2307.0508
image: aztfmod/rover:1.5.4-2307.2804
options: --user 0

steps:
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
]

container:
image: aztfmod/rover:1.4.6-2307.0508
image: aztfmod/rover:1.5.4-2307.2804
options: --user 0

steps:
Expand Down Expand Up @@ -244,7 +244,7 @@ jobs:
random_length: ['5']

container:
image: aztfmod/rover:1.4.6-2307.0508
image: aztfmod/rover:1.5.4-2307.2804
options: --user 0

steps:
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"files.eol": "\n",
"editor.tabSize": 2,
"terminal.integrated.defaultProfile.linux": "caf (zsh)",
"terminal.integrated.scrollback": 32000,
"terminal.integrated.scrollback": 64000,
"terminal.integrated.profiles.linux": {
"caf (rover on docker)": {
"path": "docker-compose",
Expand Down
1 change: 0 additions & 1 deletion aztfmod
Submodule aztfmod deleted from fc45b0
2 changes: 1 addition & 1 deletion rover_on_ssh_host.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
version: '3.7'
services:
rover:
image: aztfmod/rover:1.4.6-2307.0508
image: aztfmod/rover:1.5.4-2307.2804

user: vscode

Expand Down

0 comments on commit 71c71e4

Please sign in to comment.