Skip to content

Commit 770fe85

Browse files
committed
update docker-ros submodule
1 parent ee9d3f4 commit 770fe85

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include:
22
- project: ops/docker-ros
3-
ref: feature/ci
3+
ref: main
44
file: .gitlab-ci.template.yml

docker/docker-compose.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
x-base-image: &base-image gitlab.ika.rwth-aachen.de:5050/automated-driving/docker/ros1:latest
2-
x-devel-image: &devel-image gitlab.ika.rwth-aachen.de:5050/github/mqtt_client:latest-dev
3-
x-run-image: &run-image gitlab.ika.rwth-aachen.de:5050/github/mqtt_client:latest
4-
x-command: &command roslaunch mqtt_client standalone.launch
1+
x-base-image: &base-image gitlab.ika.rwth-aachen.de:5050/automated-driving/docker/ros1:latest # e.g. gitlab.ika.rwth-aachen.de:5050/automated-driving/docker/ros2:latest
2+
x-dev-image: &dev-image gitlab.ika.rwth-aachen.de:5050/github/mqtt_client:latest-dev # e.g. gitlab.ika.rwth-aachen.de:5050/ops/hello_world:latest-dev
3+
x-run-image: &run-image gitlab.ika.rwth-aachen.de:5050/github/mqtt_client:latest # e.g. gitlab.ika.rwth-aachen.de:5050/ops/hello_world:latest
4+
x-command: &command roslaunch mqtt_client standalone.launch # e.g. ros2 topic pub "/ping" "std_msgs/msg/String" "{data: Hello World}"
55

66
# ==============================================================================
77

@@ -15,13 +15,13 @@ x-build: &build
1515
GIT_HTTPS_PASSWORD: $GIT_HTTPS_PASSWORD
1616

1717
services:
18-
devel:
19-
image: *devel-image
18+
dev:
19+
image: *dev-image
2020
build:
21-
target: development
21+
target: dev
2222
<<: *build
2323
run:
2424
image: *run-image
2525
build:
2626
target: run
27-
<<: *build
27+
<<: *build

docker/docker-ros

0 commit comments

Comments
 (0)