Skip to content

Commit 03d2d59

Browse files
committed
Update .env to supply innocuous default for XAUTH_FILEPATH
Fix build script to *actually* pass forward extra args to docker compose build command.
1 parent 4f88709 commit 03d2d59

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

angel-docker-build.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Build the PTG ANGEL system docker container images.
1919
2020
Options:
2121
-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.
2323
"
2424
}
2525

@@ -32,7 +32,7 @@ do
3232
usage
3333
exit 0
3434
;;
35-
--force)
35+
-f|--force)
3636
log "Forcing build regardless of workspace hygiene."
3737
shift
3838
FORCE_BUILD=1
@@ -113,4 +113,4 @@ get_docker_compose_cmd DC_CMD
113113
--env-file "$SCRIPT_DIR"/docker/.env \
114114
-f "$SCRIPT_DIR"/docker/docker-compose.yml \
115115
--profile build-only \
116-
build "$@"
116+
build "${dc_forward_params[@]}" "$@"

docker/.env

+7
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,10 @@ RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
3232

3333
# This must specify the network interface for CycloneDDS to use.
3434
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

0 commit comments

Comments
 (0)