Skip to content

Commit 8a13f20

Browse files
committed
Merge branch 'dev' into beta
2 parents 8079185 + 0662ebb commit 8a13f20

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

src/lib/core/docker/container-tools/dn_project_core.build.patch.bash

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,16 @@ function dna::global_install_hack() {
1919
# ///////////////////////////////////////////////////////////////////////////////////////////////
2020
# (StandBy) ToDo: maybe transfer to Dockerized-NorLab
2121
{
22+
# Force fix any remaining broken packages
23+
export DEBIAN_FRONTEND=noninteractive && \
2224
apt-get update && \
2325
apt-get update --fix-missing && \
2426
apt-get install -y "ros-${ROS_DISTRO:?err}-rmw-cyclonedds-cpp" && \
27+
dpkg --configure -a && \
28+
apt-get install -f && \
2529
apt-get autoremove -y && \
2630
apt-get clean ;
27-
}|| return 1
31+
}|| n2st::print_msg_warning "Be advised, encountered ros-${ROS_DISTRO:?err}-rmw-cyclonedds-cpp install problem. Continue anyway."
2832
echo "Cyclon DDS performance recommendations (ref https://github.com/ros2/rmw_cyclonedds?tab=readme-ov-file)"
2933
# shellcheck disable=SC2028
3034
echo "net.core.rmem_max=8388608\nnet.core.rmem_default=8388608\n" | sudo tee /etc/sysctl.d/60-cyclonedds.conf || return 1

src/lib/core/execute/build.all.bash

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ function dna::build_services() {
145145
n2st::print_msg_error "Build error, re-running ${MSG_DIMMED_FORMAT}dna::build_services${MSG_END_FORMAT} one service at the time"
146146
for idx in "${!services_names[@]}"; do
147147
if [[ "${services_names[idx]}" == "project-core" ]]; then
148+
n2st::print_msg "Building project-core"
148149
project_core_build_idx=$idx
149150
dna::excute_compose --file "${the_compose_file}" "${build_docker_flag[@]}" project-core
150151
project_core_build_exit_code=$?
@@ -156,6 +157,7 @@ function dna::build_services() {
156157
# Execute docker cmd on all remaining service
157158
for each in "${services_names[@]}"; do
158159
if [[ "${each}" != "project-core" ]]; then
160+
n2st::print_msg "Building ${each}"
159161
dna::excute_compose --file "${the_compose_file}" "${build_docker_flag[@]}" "${each}"
160162
build_exit_code+=("$?")
161163
else
@@ -187,6 +189,7 @@ function dna::build_services() {
187189
# Rebuild and push the core image prior to building any other images
188190
for idx in "${!services_names[@]}"; do
189191
if [[ "${services_names[idx]}" == "project-core" ]]; then
192+
n2st::print_msg "Building project-core"
190193
project_core_build_idx=$idx
191194
# Note:
192195
# - THIS WORK ON MacOs with buildx builder "docker-container:local-builder-multiarch-virtual"
@@ -205,6 +208,7 @@ function dna::build_services() {
205208
# Execute docker cmd on all remaining service
206209
for each in "${services_names[@]}"; do
207210
if [[ "${each}" != "project-core" ]]; then
211+
n2st::print_msg "Building ${each}"
208212
dna::excute_compose --file "${the_compose_file}" "${build_docker_flag[@]}" "${each}"
209213
build_exit_code+=("$?")
210214
else

src/lib/core/utils/execute_compose.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ Exiting now!
195195

196196
# (Priority) ToDo: validate >> changes to next bloc ↓↓ does'nt break TeamCity build
197197
local docker_cmd_str="${MSG_DIMMED_FORMAT}docker compose --file ${compose_path}/${the_compose_file} ${docker_command_w_flags[*]}${MSG_END_FORMAT}"
198-
n2st::teamcity_service_msg_blockOpened "Execute ${docker_cmd_str[*]}"
199-
#n2st::print_msg "Execute ${docker_cmd_str}\n"
198+
n2st::print_msg "Execute ${docker_cmd_str}\n"
199+
n2st::teamcity_service_msg_blockOpened "$ docker compose --file ${compose_path}/${the_compose_file} ${docker_command_w_flags[*]}"
200200

201201
# Refactor using "n2st::show_and_execute_docker" (See ref NMO-575)
202202
docker compose --file "${compose_path}/${the_compose_file}" "${docker_command_w_flags[@]}"

0 commit comments

Comments
 (0)