Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix devcontainer for todo-java-postgresql-terraform #2597

Merged
merged 6 commits into from
Aug 4, 2023
Merged

fix devcontainer for todo-java-postgresql-terraform #2597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
93dd83b
fix devcontainer for todo-java-postgresql-terraform
vhvb1989 Aug 4, 2023
16b6c46
remove terraform folder from java devcontainer
vhvb1989 Aug 4, 2023
3591793
no exclude
vhvb1989 Aug 4, 2023
ea54f4c
explicit set of devcontainer
vhvb1989 Aug 4, 2023
8c0c48d
typo
vhvb1989 Aug 4, 2023
2a909c0
remove dockerfile for java
vhvb1989 Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions templates/common/.devcontainer/Dockerfile/java/Dockerfile
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions templates/common/.devcontainer/devcontainer.json/java/terraform/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
{
"name": "Azure Developer CLI",
"build": {
"dockerfile": "Dockerfile",
"args": {
"IMAGE": "javascript-node:16-bullseye"
}
},
"image": "mcr.microsoft.com/devcontainers/javascript-node:16-bullseye",
"features": {
"ghcr.io/devcontainers/features/azure-cli:1": {
},
Expand Down
4 changes: 2 additions & 2 deletions templates/todo/projects/csharp-cosmos-sql/.repo/bicep/repo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ repo:
to: ./infra

# .devcontainer common (devcontainer.json)
- from: ../../../../../common/.devcontainer/devcontainer.json/csharp
to: ./.devcontainer
- from: ../../../../../common/.devcontainer/devcontainer.json/csharp/devcontainer.json
to: ./.devcontainer/devcontainer.json

# Assets common
- from: ../../../../common/assets
Expand Down
4 changes: 2 additions & 2 deletions templates/todo/projects/csharp-sql-swa-func/.repo/bicep/repo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ repo:
to: ./infra

# .devcontainer common (devcontainer.json)
- from: ../../../../../common/.devcontainer/devcontainer.json/csharp/func
to: ./.devcontainer
- from: ../../../../../common/.devcontainer/devcontainer.json/csharp/func/devcontainer.json
vhvb1989 marked this conversation as resolved.
Show resolved Hide resolved
to: ./.devcontainer/devcontainer.json

# .devcontainer common (Dockerfile)
- from: ../../../../../common/.devcontainer/Dockerfile/func
Expand Down
4 changes: 2 additions & 2 deletions templates/todo/projects/csharp-sql/.repo/bicep/repo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ repo:
to: ./infra

# .devcontainer common (devcontainer.json)
- from: ../../../../../common/.devcontainer/devcontainer.json/csharp
to: ./.devcontainer
- from: ../../../../../common/.devcontainer/devcontainer.json/csharp/devcontainer.json
to: ./.devcontainer/devcontainer.json

# Assets common
- from: ../../../../common/assets
Expand Down
4 changes: 2 additions & 2 deletions templates/todo/projects/java-mongo-aca/.repo/bicep/repo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ repo:
to: ./infra

# .devcontainer common (devcontainer.json)
- from: ../../../../../common/.devcontainer/devcontainer.json/java
to: ./.devcontainer
- from: ../../../../../common/.devcontainer/devcontainer.json/java/devcontainer.json
to: ./.devcontainer/devcontainer.json

# Assets common
- from: ../../../../common/assets
Expand Down
4 changes: 2 additions & 2 deletions templates/todo/projects/java-mongo/.repo/bicep/repo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ repo:
to: ./infra

# .devcontainer common (devcontainer.json)
- from: ../../../../../common/.devcontainer/devcontainer.json/java
to: ./.devcontainer
- from: ../../../../../common/.devcontainer/devcontainer.json/java/devcontainer.json
to: ./.devcontainer/devcontainer.json

# Assets common
- from: ../../../../common/assets
Expand Down
8 changes: 2 additions & 6 deletions templates/todo/projects/java-postgresql/.repo/terraform/repo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,8 @@ repo:
to: ./infra/modules/apim-api

# .devcontainer common (devcontainer.json)
- from: ../../../../../common/.devcontainer/devcontainer.json/java/terraform
to: ./.devcontainer

# .devcontainer common (Dockerfile)
- from: ../../../../../common/.devcontainer/Dockerfile/java
to: ./.devcontainer
- from: ../../../../../common/.devcontainer/devcontainer.json/java/terraform/devcontainer.json
to: ./.devcontainer/devcontainer.json

# Assets common
- from: ../../../../common/assets
Expand Down
4 changes: 2 additions & 2 deletions templates/todo/projects/nodejs-mongo/.repo/terraform/repo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ repo:
to: ./infra/modules/apim-api

# .devcontainer common (devcontainer.json)
- from: ../../../../../common/.devcontainer/devcontainer.json/nodejs/terraform
to: ./.devcontainer
- from: ../../../../../common/.devcontainer/devcontainer.json/nodejs/terraform/devcontainer.json
to: ./.devcontainer/devcontainer.json

# Assets common
- from: ../../../../common/assets
Expand Down
4 changes: 2 additions & 2 deletions templates/todo/projects/python-mongo/.repo/terraform/repo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ repo:
to: ./infra/modules/apim-api

# .devcontainer common (devcontainer.json)
- from: ../../../../../common/.devcontainer/devcontainer.json/python/terraform
to: ./.devcontainer
- from: ../../../../../common/.devcontainer/devcontainer.json/python/terraform/devcontainer.json
to: ./.devcontainer/devcontainer.json

# Assets common
- from: ../../../../common/assets
Expand Down
Loading