Skip to content

Commit

Permalink
Adjust docker compose infrastructure
Browse files Browse the repository at this point in the history
  • Loading branch information
giacomini committed May 3, 2024
1 parent 15654d2 commit dfc9b76
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 9 deletions.
16 changes: 10 additions & 6 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,23 @@

// The 'service' property is the name of the service for the container that VS Code should
// use. Update this value and .devcontainer/docker-compose.yml to the real service name.
"service": "container-centos7",
"service": "container-centos9",

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

// The optional 'workspaceFolder' property is the path VS Code should open by default when
// connected. This is typically a file mount in .devcontainer/docker-compose.yml
"workspaceFolder": "/workspace",

"extensions": [
"ms-vscode.cpptools", "eamodio.gitlens"
],

"customizations": {
"vscode": {
"extensions": [
"ms-vscode.cpptools",
"eamodio.gitlens"
]
}
},
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

Expand Down
16 changes: 14 additions & 2 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,19 @@ services:

container-centos9:

environment:
- TZ=Europe/Rome

depends_on:
- trust

build:
context: .devcontainer
dockerfile: Dockerfile-centos9

volumes:
- trustanchors:/etc/grid-security/certificates
- .:/workspace:cached
- .:/workspace

cap_add:
- SYS_PTRACE
Expand All @@ -22,13 +28,19 @@ services:

container-centos7:

environment:
- TZ=Europe/Rome

depends_on:
- trust

build:
context: .devcontainer
dockerfile: Dockerfile-centos7

volumes:
- trustanchors:/etc/grid-security/certificates
- .:/workspace:cached
- .:/workspace

cap_add:
- SYS_PTRACE
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ volumes:

services:
trust:
image: indigoiam/egi-trustanchors
image: indigoiam/egi-trustanchors:igi-test-ca

volumes:
- trustanchors:/tmp/certificates
Expand Down

0 comments on commit dfc9b76

Please sign in to comment.