Merge pull request #488 from Azure/AL-5.7.2

This commit is contained in:
Arnaud Lheureux 2023-08-05 07:31:47 +08:00 коммит произвёл GitHub
Родитель 8e04113883 cec42df4c5
Коммит 71c71e42ce
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
6 изменённых файлов: 20 добавлений и 23 удалений

Просмотреть файл

@ -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",
@ -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": [],
@ -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"
]
}
}
}

Просмотреть файл

@ -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:

10
.github/workflows/landingzones-tf100.yml поставляемый
Просмотреть файл

@ -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:
@ -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:
@ -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:
@ -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:
@ -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:

2
.vscode/settings.json поставляемый
Просмотреть файл

@ -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",

@ -1 +0,0 @@
Subproject commit fc45b0fb1d49e41c19d1943ca8a27b54f60acfc8

Просмотреть файл

@ -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