Skip to content

Commit

Permalink
Optimistic move to workstation push
Browse files Browse the repository at this point in the history
  • Loading branch information
DiamondJoseph committed Nov 22, 2024
1 parent 86c5905 commit 5a16d1a
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 28 deletions.
18 changes: 6 additions & 12 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
// For format details, see https://containers.dev/implementors/json_reference/
{
"name": "Python 3 Developer Container",
"build": {
"dockerfile": "../Dockerfile",
"target": "developer"
},
"dockerComposeFile": [
"docker-compose.yml",
"docker-compose-infrastructure.yml"
],
"service": "devcontainer",
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
"containerEnv": {
"OTEL_EXPORTER_OTLP_TRACES_PROTOCOL": "http/protobuf",
"OTEL_EXPORTER_OTLP_ENDPOINT": "http://127.0.0.1:4318",
Expand Down Expand Up @@ -38,14 +40,6 @@
"upgradePackages": false
}
},
"runArgs": [
// Allow the container to access the host X11 display and EPICS CA
"--net=host",
// Make sure SELinux does not disable with access to host filesystems like tmp
"--security-opt=label=disable"
],
// Mount the parent as /workspaces so we can pip install peers as editable
"workspaceMount": "source=${localWorkspaceFolder}/..,target=/workspaces,type=bind",
// After the container is created, install the python project in editable form
"postCreateCommand": "pip install $([ -f dev-requirements.txt ] && echo '-c dev-requirements.txt') -e '.[dev]' && pre-commit install"
}
10 changes: 10 additions & 0 deletions .devcontainer/docker-compose-infrastructure.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
services:
rabbitmq:
image: rabbitmq:management
container_name: 'rabbitmq'
ports:
- 5672:5672
- 15672:15672
- 61613:61613
volumes:
- ./rabbitmq_setup/enabled_plugins:/etc/rabbitmq/enabled_plugins
9 changes: 9 additions & 0 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
services:
devcontainer:
build:
# target: developer
dockerfile: ../Dockerfile
volumes:
- ../..:/workspaces:cached
command: sleep infinity #--net=host --security-opt=label=disable

File renamed without changes.
16 changes: 0 additions & 16 deletions src/script/start_rabbitmq.sh

This file was deleted.

File renamed without changes.

0 comments on commit 5a16d1a

Please sign in to comment.