Commit 03d2d59 1 parent 4f88709 commit 03d2d59 Copy full SHA for 03d2d59
File tree 2 files changed +10
-3
lines changed
2 files changed +10
-3
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ Build the PTG ANGEL system docker container images.
19
19
20
20
Options:
21
21
-h | --help Display this message.
22
- -- force Force image building regardless of workspace hygiene.f
22
+ -f | -- force Force image building regardless of workspace hygiene.
23
23
"
24
24
}
25
25
32
32
usage
33
33
exit 0
34
34
;;
35
- --force)
35
+ -f|- -force)
36
36
log " Forcing build regardless of workspace hygiene."
37
37
shift
38
38
FORCE_BUILD=1
@@ -113,4 +113,4 @@ get_docker_compose_cmd DC_CMD
113
113
--env-file " $SCRIPT_DIR " /docker/.env \
114
114
-f " $SCRIPT_DIR " /docker/docker-compose.yml \
115
115
--profile build-only \
116
- build " $@ "
116
+ build " ${dc_forward_params[@]} " " $ @"
Original file line number Diff line number Diff line change @@ -32,3 +32,10 @@ RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
32
32
33
33
# This must specify the network interface for CycloneDDS to use.
34
34
CYCLONE_DDS_INTERFACE = lo
35
+
36
+ # Starting with the docker compose plugin (v2), the whole compose file will be
37
+ # validated, even for services not being run. This provides a valid "default"
38
+ # path to cause validation to succeed. This variable should be overridden when
39
+ # attempting to actually run a service that makes use of this variable.
40
+ # Path considered relative to where the docker-compose file is located.
41
+ XAUTH_FILEPATH = ../.container_xauth/.placeholder
You can’t perform that action at this time.
0 commit comments