diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ebcc4022..f7e00e1b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,7 +76,7 @@ jobs: if: github.event_name == 'pull_request' env: AGENT_VERSION: ${{ needs.build-and-push-image.outputs.version }} - COMPOSE_FILE: ./build/docker-compose.test.yml + COMPOSE_FILE: ./build/docker-compose_cicd.yaml steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/build/Taskfile b/build/Taskfile index 580d3ad0..c89e1133 100644 --- a/build/Taskfile +++ b/build/Taskfile @@ -5,36 +5,6 @@ # General commands ########################################## -task:run() { - # assure that docker can connect to the local X11-server - xhost +local:docker - docker:compose up "$@" -} - -task:run_dev() { - xhost +local:docker - docker:compose -f docker-compose.dev.yaml up -} - -task:run_distributed() { - xhost +local:docker - docker:compose -f docker-compose.distributed.yaml up -} - -task:run_dev_distributed() { - xhost +local:docker - docker:compose -f docker-compose.dev.distributed.yaml up -} - -task:restart() { - container="$1" - docker:compose restart "${container:-agent}" -} - -task:halt() { - docker:compose down "$@" -} - task:shell() { container="$1" command="$2" @@ -58,7 +28,7 @@ install:gpu-support() { if [ -z "$(command -v docker-nvidia)" ] then - task:nvidia:enable + echo -e "Juhu! Alles ist richtig installiert für NVIDIA-Support! Hier ein Keks für dich :D" else RED='\033[0;31m' NC='\033[0m' @@ -68,16 +38,6 @@ install:gpu-support() { fi } -task:update() { - docker:update -} - -task:nvidia:enable() { - # Writes the content of templates/config.nvidia.yml.jinja2 to config.local.yml - # This file tells b5 to read docker-compose.nvidia.yml in addition to docker-compose.yml - template:render --overwrite ask-if-older templates/config.nvidia.yml.jinja2 config.local.yml -} - ########################################## # Project linting ########################################## diff --git a/build/agent_service.yaml b/build/agent_service.yaml new file mode 100644 index 00000000..d516c753 --- /dev/null +++ b/build/agent_service.yaml @@ -0,0 +1,47 @@ +services: + agent: + build: + dockerfile: build/docker/agent/Dockerfile + args: + - USER_UID=${DOCKER_HOST_UNIX_UID:-1000} + - USER_GID=${DOCKER_HOST_UNIX_GID:-1000} + context: ../ + init: true + tty: true + shm_size: 2gb + deploy: + resources: + reservations: + devices: + - driver: nvidia + capabilities: [ gpu ] + # executes default command specified in agent Dockerfile + # build/docker/agent/Dockerfile + logging: + driver: "local" + environment: + - DISPLAY + - NVIDIA_VISIBLE_DEVICES=all + - NVIDIA_DRIVER_CAPABILITIES=all + - ROS_MASTER_URI=http://roscore:11311 + - CARLA_SIM_HOST=carla-simulator + - ROS_HOSTNAME=agent + - XDG_RUNTIME_DIR=/tmp/runtime-carla + # - ROUTE=/opt/leaderboard/data/routes_devtest.xml + # Simple route without special scenarios + - ROUTE=/workspace/code/routes/routes_simple.xml + volumes: + - /tmp/.X11-unix:/tmp/.X11-unix + # if you change the volume here also change the copy command + # in ``build/docker/build/Dockerfile + - ../:/workspace + # mount git config for dvc + - ../.gitconfig:/home/carla/.gitconfig + - ../:/workspace/ + networks: + - carla + - ros + +networks: + carla: + ros: diff --git a/build/carla-simulator_service.yaml b/build/carla-simulator_service.yaml new file mode 100644 index 00000000..6bd9d6dd --- /dev/null +++ b/build/carla-simulator_service.yaml @@ -0,0 +1,31 @@ +services: + # based on https://github.com/ll7/paf21-1/blob/master/scenarios/docker-carla-sim-compose.yml + carla-simulator: + command: /bin/bash CarlaUE4.sh -quality-level=Epic -world-port=2000 -resx=800 -resy=600 -nosound -carla-settings="/home/carla/CarlaUE4/Config/CustomCarlaSettings.ini" + image: ghcr.io/una-auxme/paf23:leaderboard-2.0 + init: true + deploy: + resources: + limits: + memory: 16G + reservations: + devices: + - driver: nvidia + capabilities: [ gpu ] + expose: + - 2000 + - 2001 + - 2002 + environment: + - DISPLAY + - NVIDIA_VISIBLE_DEVICES=all + - NVIDIA_DRIVER_CAPABILITIES=all + - XDG_RUNTIME_DIR=/tmp/runtime-carla + networks: + - carla + volumes: + - /tmp/.X11-unix:/tmp/.X11-unix + - ./CustomCarlaSettings.ini:/home/carla/CarlaUE4/Config/CustomCarlaSettings.ini + +networks: + carla: \ No newline at end of file diff --git a/build/config-comlipy.yml b/build/config-comlipy.yml index 95023082..df6e585c 100644 --- a/build/config-comlipy.yml +++ b/build/config-comlipy.yml @@ -1,3 +1,4 @@ +# comlipy config file (commit naming) global: help: 'Help: https://github.com/ll7/paf22/blob/main/doc/developement/commit.md' diff --git a/build/config.yml b/build/config.yml index 3a0359f7..648c6c08 100644 --- a/build/config.yml +++ b/build/config.yml @@ -1,3 +1,4 @@ +# b5 config file modules: template: docker: diff --git a/build/docker-compose.dev.distributed.yaml b/build/docker-compose.dev.distributed.yaml deleted file mode 100644 index 5eba6099..00000000 --- a/build/docker-compose.dev.distributed.yaml +++ /dev/null @@ -1,77 +0,0 @@ -version: "3" - -services: - flake8: - image: alpine/flake8 - command: . - volumes: - - ../:/apps - - comlipy: - build: docker/comlipy - command: . - volumes: - - ../:/apps - - mdlint: - image: peterdavehello/markdownlint:0.32.2 - command: markdownlint . - volumes: - - ../:/md - - roscore: - image: ros:noetic - command: roscore - environment: - - ROS_MASTER_URI=http://roscore:11311 - - ROS_HOSTNAME=roscore - expose: - - 11311 - networks: - - ros - - agent: - build: - dockerfile: build/docker/agent/Dockerfile - args: - - USER_UID=${DOCKER_HOST_UNIX_UID:-1000} - - USER_GID=${DOCKER_HOST_UNIX_GID:-1000} - context: ../ - init: true - tty: true - shm_size: 2gb - deploy: - resources: - reservations: - devices: - - driver: nvidia - capabilities: [ gpu ] - #command: bash -c "sleep 10 && python3 /opt/leaderboard/leaderboard/leaderboard_evaluator.py --debug=0 --routes=/opt/leaderboard/data/routes_devtest.xml --agent=/opt/leaderboard/leaderboard/autoagents/npc_agent.py --host=carla-simulator --track=SENSORS" - command: bash -c "sleep 10 && roslaunch agent/launch/dev.launch" - # command: bash -c "sleep 10 && sudo chown -R carla:carla ../code/ && sudo chmod -R a+w ../code/ && python3 /opt/leaderboard/leaderboard/leaderboard_evaluator.py --debug=0 --routes=/opt/leaderboard/data/routes_devtest.xml --agent=/workspace/code/agent/src/agent/agent.py --host=paf23-carla-simulator-1 --track=MAP" - - logging: - driver: "local" - environment: - - DISPLAY - - NVIDIA_VISIBLE_DEVICES=all - - NVIDIA_DRIVER_CAPABILITIES=all - - ROS_MASTER_URI=http://roscore:11311 - - CARLA_SIM_HOST= - - ROS_HOSTNAME=agent - - XDG_RUNTIME_DIR=/tmp/runtime-carla - volumes: - - /tmp/.X11-unix:/tmp/.X11-unix - # if you change the volume here also change the copy command - # in ``build/docker/build/Dockerfile - - ../:/workspace - # mount git config for dvc - - ../.gitconfig:/home/carla/.gitconfig - - ../:/workspace/ - networks: - - carla - - ros - -networks: - carla: - ros: diff --git a/build/docker-compose.dev.yaml b/build/docker-compose.dev.yaml deleted file mode 100644 index 3e9980f5..00000000 --- a/build/docker-compose.dev.yaml +++ /dev/null @@ -1,105 +0,0 @@ -version: "3" - -services: - flake8: - image: alpine/flake8 - command: . - volumes: - - ../:/apps - - comlipy: - build: docker/comlipy - command: . - volumes: - - ../:/apps - - mdlint: - image: peterdavehello/markdownlint:0.32.2 - command: markdownlint . - volumes: - - ../:/md - - # based on https://github.com/ll7/paf21-1/blob/master/scenarios/docker-carla-sim-compose.yml - carla-simulator: - command: /bin/bash CarlaUE4.sh -quality-level=Epic -world-port=2000 -resx=800 -resy=600 -nosound -carla-settings="/home/carla/CarlaUE4/Config/CustomCarlaSettings.ini" - image: ghcr.io/una-auxme/paf23:leaderboard-2.0 - init: true - deploy: - resources: - limits: - memory: 16G - reservations: - devices: - - driver: nvidia - capabilities: [ gpu ] - expose: - - 2000 - - 2001 - - 2002 - environment: - - DISPLAY - - NVIDIA_VISIBLE_DEVICES=all - - NVIDIA_DRIVER_CAPABILITIES=all - - XDG_RUNTIME_DIR=/tmp/runtime-carla - networks: - - carla - volumes: - - /tmp/.X11-unix:/tmp/.X11-unix - - ./CustomCarlaSettings.ini:/home/carla/CarlaUE4/Config/CustomCarlaSettings.ini - - roscore: - image: ros:noetic - command: roscore - environment: - - ROS_MASTER_URI=http://roscore:11311 - - ROS_HOSTNAME=roscore - expose: - - 11311 - networks: - - ros - - agent: - build: - dockerfile: build/docker/agent/Dockerfile - args: - - USER_UID=${DOCKER_HOST_UNIX_UID:-1000} - - USER_GID=${DOCKER_HOST_UNIX_GID:-1000} - context: ../ - init: true - tty: true - shm_size: 2gb - deploy: - resources: - reservations: - devices: - - driver: nvidia - capabilities: [ gpu ] - #command: bash -c "sleep 10 && python3 /opt/leaderboard/leaderboard/leaderboard_evaluator.py --debug=0 --routes=/opt/leaderboard/data/routes_devtest.xml --agent=/opt/leaderboard/leaderboard/autoagents/npc_agent.py --host=carla-simulator --track=SENSORS" - command: bash -c "sleep 10 && roslaunch agent/launch/dev.launch" - # command: bash -c "sleep 10 && sudo chown -R carla:carla ../code/ && sudo chmod -R a+w ../code/ && python3 /opt/leaderboard/leaderboard/leaderboard_evaluator.py --debug=0 --routes=/opt/leaderboard/data/routes_devtest.xml --agent=/workspace/code/agent/src/agent/agent.py --host=paf23-carla-simulator-1 --track=MAP" - - logging: - driver: "local" - environment: - - DISPLAY - - NVIDIA_VISIBLE_DEVICES=all - - NVIDIA_DRIVER_CAPABILITIES=all - - ROS_MASTER_URI=http://roscore:11311 - - CARLA_SIM_HOST=carla-simulator - - ROS_HOSTNAME=agent - - XDG_RUNTIME_DIR=/tmp/runtime-carla - volumes: - - /tmp/.X11-unix:/tmp/.X11-unix - # if you change the volume here also change the copy command - # in ``build/docker/build/Dockerfile - - ../:/workspace - # mount git config for dvc - - ../.gitconfig:/home/carla/.gitconfig - - ../:/workspace/ - networks: - - carla - - ros - -networks: - carla: - ros: diff --git a/build/docker-compose.distributed.yaml b/build/docker-compose.distributed.yaml deleted file mode 100644 index ecffb8eb..00000000 --- a/build/docker-compose.distributed.yaml +++ /dev/null @@ -1,77 +0,0 @@ -version: "3" - -services: - flake8: - image: alpine/flake8 - command: . - volumes: - - ../:/apps - - comlipy: - build: docker/comlipy - command: . - volumes: - - ../:/apps - - mdlint: - image: peterdavehello/markdownlint:0.32.2 - command: markdownlint . - volumes: - - ../:/md - - roscore: - image: ros:noetic - command: roscore - environment: - - ROS_MASTER_URI=http://roscore:11311 - - ROS_HOSTNAME=roscore - expose: - - 11311 - networks: - - ros - - agent: - build: - dockerfile: build/docker/agent/Dockerfile - args: - - USER_UID=${DOCKER_HOST_UNIX_UID:-1000} - - USER_GID=${DOCKER_HOST_UNIX_GID:-1000} - context: ../ - init: true - tty: true - shm_size: 2gb - deploy: - resources: - reservations: - devices: - - driver: nvidia - capabilities: [ gpu ] - #command: bash -c "sleep 10 && python3 /opt/leaderboard/leaderboard/leaderboard_evaluator.py --debug=0 --routes=/opt/leaderboard/data/routes_devtest.xml --agent=/opt/leaderboard/leaderboard/autoagents/npc_agent.py --host=carla-simulator --track=SENSORS" - #command: bash -c "sleep 10 && roslaunch agent/launch/dev.launch" - command: bash -c "sleep 10 && sudo chown -R carla:carla ../code/ && sudo chmod -R a+w ../code/ && python3 /opt/leaderboard/leaderboard/leaderboard_evaluator.py --debug=0 --routes=/opt/leaderboard/data/routes_devtest.xml --agent=/workspace/code/agent/src/agent/agent.py --host= --track=MAP" - - logging: - driver: "local" - environment: - - DISPLAY - - NVIDIA_VISIBLE_DEVICES=all - - NVIDIA_DRIVER_CAPABILITIES=all - - ROS_MASTER_URI=http://roscore:11311 - - CARLA_SIM_HOST= - - ROS_HOSTNAME=agent - - XDG_RUNTIME_DIR=/tmp/runtime-carla - volumes: - - /tmp/.X11-unix:/tmp/.X11-unix - # if you change the volume here also change the copy command - # in ``build/docker/build/Dockerfile - - ../:/workspace - # mount git config for dvc - - ../.gitconfig:/home/carla/.gitconfig - - ../:/workspace/ - networks: - - carla - - ros - -networks: - carla: - ros: diff --git a/build/docker-compose.nvidia.yml b/build/docker-compose.nvidia.yml deleted file mode 100644 index 93d5b51c..00000000 --- a/build/docker-compose.nvidia.yml +++ /dev/null @@ -1,29 +0,0 @@ -version: "3" - -# This file should contain all nvidia GPU specific configuration. -# Only loaded of specified in config.local.yml - -services: - carla-simulator: - deploy: - resources: - reservations: - devices: - - driver: nvidia - capabilities: [ gpu ] - environment: - - DISPLAY - - NVIDIA_VISIBLE_DEVICES=all - - NVIDIA_DRIVER_CAPABILITIES=all - - agent: - deploy: - resources: - reservations: - devices: - - driver: nvidia - capabilities: [ gpu ] - environment: - - NVIDIA_VISIBLE_DEVICES=all - - NVIDIA_DRIVER_CAPABILITIES=all - diff --git a/build/docker-compose.test.yml b/build/docker-compose.test.yml deleted file mode 100644 index 83d532e0..00000000 --- a/build/docker-compose.test.yml +++ /dev/null @@ -1,64 +0,0 @@ -version: "3" -name: "paf22-test" - -services: - carla-simulator: - command: /bin/bash CarlaUE4.sh -quality-level=Epic -world-port=2000 -RenderOffScreen -nosound - image: ghcr.io/una-auxme/paf23:leaderboard-2.0 - init: true - deploy: - resources: - reservations: - devices: - - driver: nvidia - capabilities: [ gpu ] - environment: - - NVIDIA_VISIBLE_DEVICES=all - - NVIDIA_DRIVER_CAPABILITIES=all - expose: - - 2000 - - 2001 - - 2002 - networks: - - carla - - roscore: - image: ros:noetic - command: roscore - environment: - - ROS_MASTER_URI=http://roscore:11311 - - ROS_HOSTNAME=roscore - expose: - - 11311 - networks: - - ros - - agent: - image: ghcr.io/una-auxme/paf23:${AGENT_VERSION:-latest} - init: true - tty: true - logging: - driver: "local" - depends_on: - - carla-simulator - - roscore - deploy: - resources: - reservations: - devices: - - driver: nvidia - capabilities: [ gpu ] - environment: - - NVIDIA_VISIBLE_DEVICES=all - - NVIDIA_DRIVER_CAPABILITIES=all - - ROS_MASTER_URI=http://roscore:11311 - - CARLA_SIM_HOST=carla-simulator - - ROS_HOSTNAME=agent - - CHECKPOINT_ENDPOINT=/tmp/simulation_results.json - networks: - - carla - - ros - -networks: - carla: - ros: diff --git a/build/docker-compose.yaml b/build/docker-compose.yaml new file mode 100644 index 00000000..44acaf62 --- /dev/null +++ b/build/docker-compose.yaml @@ -0,0 +1,11 @@ +include: + - linter_services.yaml + - roscore_service.yaml + - carla-simulator_service.yaml + +services: + agent: + extends: + file: agent_service.yaml + service: agent + command: bash -c "sleep 10 && sudo chown -R carla:carla ../code/ && sudo chmod -R a+w ../code/ && python3 /opt/leaderboard/leaderboard/leaderboard_evaluator.py --debug=0 --routes=$${ROUTE} --agent=/workspace/code/agent/src/agent/agent.py --host=$${CARLA_SIM_HOST} --track=MAP" diff --git a/build/docker-compose.yml b/build/docker-compose.yml deleted file mode 100644 index af4a4ba5..00000000 --- a/build/docker-compose.yml +++ /dev/null @@ -1,107 +0,0 @@ -version: "3" - -services: - flake8: - image: alpine/flake8 - command: . - volumes: - - ../:/apps - - comlipy: - build: docker/comlipy - command: . - volumes: - - ../:/apps - - mdlint: - image: peterdavehello/markdownlint:0.32.2 - command: markdownlint . - volumes: - - ../:/md - - # based on https://github.com/ll7/paf21-1/blob/master/scenarios/docker-carla-sim-compose.yml - carla-simulator: - command: /bin/bash CarlaUE4.sh -quality-level=High -world-port=2000 -resx=800 -resy=600 -nosound -carla-settings="/home/carla/CarlaUE4/Config/CustomCarlaSettings.ini" - image: ghcr.io/una-auxme/paf23:leaderboard-2.0 - init: true - deploy: - resources: - limits: - memory: 16G - reservations: - devices: - - driver: nvidia - capabilities: [ gpu ] - expose: - - 2000 - - 2001 - - 2002 - environment: - - DISPLAY - - NVIDIA_VISIBLE_DEVICES=all - - NVIDIA_DRIVER_CAPABILITIES=all - - XDG_RUNTIME_DIR=/tmp/runtime-carla - networks: - - carla - volumes: - - /tmp/.X11-unix:/tmp/.X11-unix - - ./CustomCarlaSettings.ini:/home/carla/CarlaUE4/Config/CustomCarlaSettings.ini - - roscore: - image: ros:noetic - command: roscore - environment: - - ROS_MASTER_URI=http://roscore:11311 - - ROS_HOSTNAME=roscore - expose: - - 11311 - networks: - - ros - - agent: - build: - dockerfile: build/docker/agent/Dockerfile - args: - - USER_UID=${DOCKER_HOST_UNIX_UID:-1000} - - USER_GID=${DOCKER_HOST_UNIX_GID:-1000} - context: ../ - init: true - tty: true - shm_size: 2gb - deploy: - resources: - reservations: - devices: - - driver: nvidia - capabilities: [ gpu ] - #command: bash -c "sleep 10 && python3 /opt/leaderboard/leaderboard/leaderboard_evaluator.py --debug=0 --routes=/opt/leaderboard/data/routes_devtest.xml --agent=/opt/leaderboard/leaderboard/autoagents/npc_agent.py --host=carla-simulator --track=SENSORS" - #command: bash -c "sleep 10 && roslaunch agent/launch/dev.launch" - command: bash -c "sleep 10 && sudo chown -R carla:carla ../code/ && sudo chmod -R a+w ../code/ && python3 /opt/leaderboard/leaderboard/leaderboard_evaluator.py --debug=0 --routes=$${ROUTE} --agent=/workspace/code/agent/src/agent/agent.py --host=carla-simulator --track=MAP" - - logging: - driver: "local" - environment: - - DISPLAY - - NVIDIA_VISIBLE_DEVICES=all - - NVIDIA_DRIVER_CAPABILITIES=all - - ROS_MASTER_URI=http://roscore:11311 - - CARLA_SIM_HOST=carla-simulator - - ROS_HOSTNAME=agent - - XDG_RUNTIME_DIR=/tmp/runtime-carla - # - ROUTE=/opt/leaderboard/data/routes_devtest.xml - - ROUTE=/workspace/code/routes/routes_simple.xml - volumes: - - /tmp/.X11-unix:/tmp/.X11-unix - # if you change the volume here also change the copy command - # in ``build/docker/build/Dockerfile - - ../:/workspace - # mount git config for dvc - - ../.gitconfig:/home/carla/.gitconfig - - ../:/workspace/ - networks: - - carla - - ros - -networks: - carla: - ros: diff --git a/build/docker-compose_cicd.yaml b/build/docker-compose_cicd.yaml new file mode 100644 index 00000000..ec74ff66 --- /dev/null +++ b/build/docker-compose_cicd.yaml @@ -0,0 +1,31 @@ +include: + # linter runs in a seperate workflow + - roscore_service.yaml + - carla-simulator_service.yaml + +services: + agent: + image: ghcr.io/una-auxme/paf23:${AGENT_VERSION:-latest} + init: true + tty: true + logging: + driver: "local" + depends_on: + - carla-simulator + - roscore + deploy: + resources: + reservations: + devices: + - driver: nvidia + capabilities: [ gpu ] + environment: + - NVIDIA_VISIBLE_DEVICES=all + - NVIDIA_DRIVER_CAPABILITIES=all + - ROS_MASTER_URI=http://roscore:11311 + - CARLA_SIM_HOST=carla-simulator + - ROS_HOSTNAME=agent + - CHECKPOINT_ENDPOINT=/tmp/simulation_results.json + networks: + - carla + - ros diff --git a/build/docker-compose_dev.yaml b/build/docker-compose_dev.yaml new file mode 100644 index 00000000..dcd2f518 --- /dev/null +++ b/build/docker-compose_dev.yaml @@ -0,0 +1,11 @@ +include: + - linter_services.yaml + - roscore_service.yaml + - carla-simulator_service.yaml + +services: + agent: + extends: + file: agent_service.yaml + service: agent + command: bash -c "sleep 10 && roslaunch agent/launch/dev.launch" diff --git a/build/docker-compose_dev_distributed.yaml b/build/docker-compose_dev_distributed.yaml new file mode 100644 index 00000000..73b7d21a --- /dev/null +++ b/build/docker-compose_dev_distributed.yaml @@ -0,0 +1,15 @@ +include: + - linter_services.yaml + - roscore_service.yaml + +services: + agent: + extends: + file: agent_service.yaml + service: agent + command: bash -c "sleep 10 && roslaunch agent/launch/dev.launch" + environment: + - CARLA_SIM_HOST= + +networks: + carla: \ No newline at end of file diff --git a/build/docker-compose_distributed.yaml b/build/docker-compose_distributed.yaml new file mode 100644 index 00000000..75a04f16 --- /dev/null +++ b/build/docker-compose_distributed.yaml @@ -0,0 +1,15 @@ +include: + - linter_services.yaml + - roscore_service.yaml + +services: + agent: + extends: + file: agent_service.yaml + service: agent + command: bash -c "sleep 10 && sudo chown -R carla:carla ../code/ && sudo chmod -R a+w ../code/ && python3 /opt/leaderboard/leaderboard/leaderboard_evaluator.py --debug=0 --routes=$${ROUTE} --agent=/workspace/code/agent/src/agent/agent.py --host=$${CARLA_SIM_HOST} --track=MAP" + environment: + - CARLA_SIM_HOST=137.250.121.39 + +networks: + carla: \ No newline at end of file diff --git a/build/docker/agent/Dockerfile b/build/docker/agent/Dockerfile index bee277af..ea981056 100644 --- a/build/docker/agent/Dockerfile +++ b/build/docker/agent/Dockerfile @@ -178,7 +178,9 @@ WORKDIR /workspace/code RUN echo "source /opt/ros/noetic/setup.bash" >> ~/.bashrc ENTRYPOINT ["/entrypoint.sh"] -CMD ["bash", "-c", "sleep 10 && python3 /opt/leaderboard/leaderboard/leaderboard_evaluator.py --debug=${DEBUG_CHALLENGE} \ +CMD ["bash", "-c", "sleep 10 && \ +python3 /opt/leaderboard/leaderboard/leaderboard_evaluator.py \ +--debug=${DEBUG_CHALLENGE} \ --repetitions=${REPETITIONS} \ --checkpoint=${CHECKPOINT_ENDPOINT} \ --track=${CHALLENGE_TRACK} \ diff --git a/build/linter_services.yaml b/build/linter_services.yaml new file mode 100644 index 00000000..3e386f88 --- /dev/null +++ b/build/linter_services.yaml @@ -0,0 +1,18 @@ +services: + flake8: + image: alpine/flake8 + command: . + volumes: + - ../:/apps + + comlipy: + build: docker/comlipy + command: . + volumes: + - ../:/apps + + mdlint: + image: peterdavehello/markdownlint:0.32.2 + command: markdownlint . + volumes: + - ../:/md \ No newline at end of file diff --git a/build/roscore_service.yaml b/build/roscore_service.yaml new file mode 100644 index 00000000..c2499536 --- /dev/null +++ b/build/roscore_service.yaml @@ -0,0 +1,14 @@ +services: + roscore: + image: ros:noetic + command: roscore + environment: + - ROS_MASTER_URI=http://roscore:11311 + - ROS_HOSTNAME=roscore + expose: + - 11311 + networks: + - ros + +networks: + ros: \ No newline at end of file diff --git a/build/templates/config.nvidia.yml.jinja2 b/build/templates/config.nvidia.yml.jinja2 deleted file mode 100644 index 6d6eddff..00000000 --- a/build/templates/config.nvidia.yml.jinja2 +++ /dev/null @@ -1,6 +0,0 @@ -# Using nvidia GPU: -# Tells b5 to use docker-compose.nvidia.yml additionally -modules: - docker: - docker_compose_config_overrides: - - nvidia diff --git a/code/routes/routes_simple.xml b/code/routes/routes_simple.xml index b119f769..f3964786 100644 --- a/code/routes/routes_simple.xml +++ b/code/routes/routes_simple.xml @@ -1,3 +1,4 @@ + diff --git a/xhost_enable.sh b/xhost_enable.sh new file mode 100755 index 00000000..71ea0e91 --- /dev/null +++ b/xhost_enable.sh @@ -0,0 +1 @@ +xhost +local: \ No newline at end of file