From 3e2d97baaff54458c4455122cac0108b28028acc Mon Sep 17 00:00:00 2001 From: Bryan Rodriguez Date: Mon, 28 Aug 2023 21:59:48 -0600 Subject: [PATCH] v3.1.4 (#51) * v3.1.4 * v3.1.4 --- CHANGELOG.md | 10 ++++++++ build.sh | 2 +- compose/docker-compose.yml | 4 ++-- .../containers/services/getty/lower/etc/motd | 23 +++++++++---------- .../containers/services/sshd/lower/etc/motd | 23 +++++++++---------- dockerfiles/uos/files/etc/issue | 23 +++++++++---------- dockerfiles/uos/uos-wifi.yml | 2 +- run.sh | 2 +- scripts/templateutils.sh | 4 ++-- 9 files changed, 50 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e21c1a8..4976e07 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -247,6 +247,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Known Problem - Missing instructions of how to build the boot.wim, boot.sdi and BCD from Microsoft ADK +## [3.1.4] - 2023-08-28 +### Changed +- Fixed conf/config.yml unset variable disable_fluent_logging +- Fixed ESP uOS MOTD +- Fixed Network Detection + +### Known Problem +- Missing instructions of how to build the boot.wim, boot.sdi and BCD from Microsoft ADK + [1.5.1]: https://github.com/intel/Edge-Software-Provisioner/compare/v1.5...v1.5.1 [1.6.0]: https://github.com/intel/Edge-Software-Provisioner/compare/v1.5.1...v1.6 @@ -267,3 +276,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/). [3.0.2]: https://github.com/intel/Edge-Software-Provisioner/compare/v3.0.1...v3.0.2 [3.0.5]: https://github.com/intel/Edge-Software-Provisioner/compare/v3.0.2...v3.0.5 [3.1.2]: https://github.com/intel/Edge-Software-Provisioner/compare/v3.0.5...v3.1.2 +[3.1.2]: https://github.com/intel/Edge-Software-Provisioner/compare/v3.1.2...v3.1.4 diff --git a/build.sh b/build.sh index e16f644..fc353ab 100755 --- a/build.sh +++ b/build.sh @@ -545,7 +545,7 @@ else fi #Enable/Disable fluent logging for dnsmasq service -if [[ "${builder_config_disable_fluent_logging-false}" == "false" ]]; then +if [[ "${builder_config_disable_fluent_logging-true}" == "false" ]]; then if grep -q '# driver: "fluentd"' docker-compose.yml; then sed -zEi 's|driver: "json-file"\n[^\n]*options:\n[^\n]*max-file: "5"\n[^\n]*max-size: "1m"(\n[^\n]*# driver: "fluentd")|# driver: "json-file"\n # options:\n # max-file: "5"\n # max-size: "1m"\1|' docker-compose.yml sed -zEi 's|# driver: "fluentd"[^.]*"localhost:24224"|driver: "fluentd"\n options:\n fluentd-address: "localhost:24224"|' docker-compose.yml diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index 5b9ecf2..830fc67 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -11,9 +11,9 @@ networks: services: core: - image: intel/esp-core:v3.1.2 + image: intel/esp-core:v3.1.4 environment: - - CONTAINER_IMAGES=intel/esp-core:v3.1.2 intel/esp-gitea:v3.1.2 intel/esp-dnsmasq:v3.1.2 intel/esp-squid:v3.1.2 intel/esp-web:v3.1.2 intel/esp-git:v3.1.2 intel/esp-aws-cli:v3.1.2 intel/esp-uos-builder:v3.1.2 intel/esp-qemu:v3.1.2 intel/esp-certbot:v3.1.2 intel/esp-smb:v3.1.2 intel/esp-dyn-profile:v3.1.2 intel/esp-logging-agent:v3.1.2 intel/esp-uos-kernel:v3.1.2 intel/esp-uos-wifi:v3.1.2 intel/esp-uos-firmware-wifi:v3.1.2 intel/esp-uos-firmware-lan:v3.1.2 intel/esp-uos-dyninit:v3.1.2 + - CONTAINER_IMAGES=intel/esp-core:v3.1.4 intel/esp-gitea:v3.1.2 intel/esp-dnsmasq:v3.1.2 intel/esp-squid:v3.1.2 intel/esp-web:v3.1.2 intel/esp-git:v3.1.2 intel/esp-aws-cli:v3.1.2 intel/esp-uos-builder:v3.1.2 intel/esp-qemu:v3.1.2 intel/esp-certbot:v3.1.2 intel/esp-smb:v3.1.2 intel/esp-dyn-profile:v3.1.2 intel/esp-logging-agent:v3.1.2 intel/esp-uos-kernel:v3.1.2 intel/esp-uos-wifi:v3.1.2 intel/esp-uos-firmware-wifi:v3.1.2 intel/esp-uos-firmware-lan:v3.1.2 intel/esp-uos-dyninit:v3.1.2 - BUILDER_PATH=${PWD} - PATH=${PWD}:/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin - http_proxy=${http_proxy:-} diff --git a/dockerfiles/uos/files/containers/services/getty/lower/etc/motd b/dockerfiles/uos/files/containers/services/getty/lower/etc/motd index 1798cdf..05f6ab6 100755 --- a/dockerfiles/uos/files/containers/services/getty/lower/etc/motd +++ b/dockerfiles/uos/files/containers/services/getty/lower/etc/motd @@ -1,13 +1,12 @@ - - /###### /###### - /##__ ## /##__ ## - /## /##| ## \ ##| ## \__/ - | ## | ##| ## | ##| ###### - | ## | ##| ## | ## \____ ## - | ## | ##| ## | ## /## \ ## - | ######/| ######/| ######/ - \______/ \______/ \______/ - - -Welcome to uOS. + + Intel + ███████╗███████╗██████╗ ██████╗ ███████╗ + ██╔════╝██╔════╝██╔══██╗ ██╗ ██╗██╔═══██╗██╔════╝ + █████╗ ███████╗██████╔╝ ██║ ██║██║ ██║███████╗ + ██╔══╝ ╚════██║██╔═══╝ ██║ ██║██║ ██║╚════██║ + ███████╗███████║██║ ╚██████╔╝╚██████╔╝███████║ + ╚══════╝╚══════╝╚═╝ ╚═════╝ ╚═════╝ ╚══════╝ + Intel Edge Software Provisioner Micro OS + + \ No newline at end of file diff --git a/dockerfiles/uos/files/containers/services/sshd/lower/etc/motd b/dockerfiles/uos/files/containers/services/sshd/lower/etc/motd index 1798cdf..05f6ab6 100755 --- a/dockerfiles/uos/files/containers/services/sshd/lower/etc/motd +++ b/dockerfiles/uos/files/containers/services/sshd/lower/etc/motd @@ -1,13 +1,12 @@ - - /###### /###### - /##__ ## /##__ ## - /## /##| ## \ ##| ## \__/ - | ## | ##| ## | ##| ###### - | ## | ##| ## | ## \____ ## - | ## | ##| ## | ## /## \ ## - | ######/| ######/| ######/ - \______/ \______/ \______/ - - -Welcome to uOS. + + Intel + ███████╗███████╗██████╗ ██████╗ ███████╗ + ██╔════╝██╔════╝██╔══██╗ ██╗ ██╗██╔═══██╗██╔════╝ + █████╗ ███████╗██████╔╝ ██║ ██║██║ ██║███████╗ + ██╔══╝ ╚════██║██╔═══╝ ██║ ██║██║ ██║╚════██║ + ███████╗███████║██║ ╚██████╔╝╚██████╔╝███████║ + ╚══════╝╚══════╝╚═╝ ╚═════╝ ╚═════╝ ╚══════╝ + Intel Edge Software Provisioner Micro OS + + \ No newline at end of file diff --git a/dockerfiles/uos/files/etc/issue b/dockerfiles/uos/files/etc/issue index 1798cdf..05f6ab6 100755 --- a/dockerfiles/uos/files/etc/issue +++ b/dockerfiles/uos/files/etc/issue @@ -1,13 +1,12 @@ - - /###### /###### - /##__ ## /##__ ## - /## /##| ## \ ##| ## \__/ - | ## | ##| ## | ##| ###### - | ## | ##| ## | ## \____ ## - | ## | ##| ## | ## /## \ ## - | ######/| ######/| ######/ - \______/ \______/ \______/ - - -Welcome to uOS. + + Intel + ███████╗███████╗██████╗ ██████╗ ███████╗ + ██╔════╝██╔════╝██╔══██╗ ██╗ ██╗██╔═══██╗██╔════╝ + █████╗ ███████╗██████╔╝ ██║ ██║██║ ██║███████╗ + ██╔══╝ ╚════██║██╔═══╝ ██║ ██║██║ ██║╚════██║ + ███████╗███████║██║ ╚██████╔╝╚██████╔╝███████║ + ╚══════╝╚══════╝╚═╝ ╚═════╝ ╚═════╝ ╚══════╝ + Intel Edge Software Provisioner Micro OS + + \ No newline at end of file diff --git a/dockerfiles/uos/uos-wifi.yml b/dockerfiles/uos/uos-wifi.yml index 4408750..0ac80d2 100644 --- a/dockerfiles/uos/uos-wifi.yml +++ b/dockerfiles/uos/uos-wifi.yml @@ -99,7 +99,7 @@ files: # ssh-rsa fill-this-in-with-an-ssh-key-if-you-want mode: "0600" - path: etc/docker/daemon.json - contents: '{"debug": true}' + contents: '{"debug": true, "storage-driver": "vfs"}' - path: usr/local/bin/uos contents: | hostname uos diff --git a/run.sh b/run.sh index c31e1ed..85ee2cb 100755 --- a/run.sh +++ b/run.sh @@ -137,7 +137,7 @@ else if [[ "${builder_config_dynamic_profile__enabled-x}" == "true" ]]; then DOCKER_COMPOSE_SERVICES="${DOCKER_COMPOSE_SERVICES} dyn-profile" fi - if [[ "${builder_config_disable_fluent_logging-false}" == "false" ]]; then + if [[ "${builder_config_disable_fluent_logging-true}" == "false" ]]; then DOCKER_COMPOSE_SERVICES="${DOCKER_COMPOSE_SERVICES} logging-server" fi docker-compose up -d ${DOCKER_COMPOSE_SERVICES} diff --git a/scripts/templateutils.sh b/scripts/templateutils.sh index e196855..823aa72 100644 --- a/scripts/templateutils.sh +++ b/scripts/templateutils.sh @@ -23,7 +23,7 @@ getMyIp() { getMyDefaultRoute() { if [[ -z "${builder_config_interface+x}" ]]; then - echo $(ip route show | grep -i 'default via'| awk '{print $3 }') + echo $(ip route show | grep -i 'default via'| awk '{print $3 }' | head -n 1 ) else ifDefaultRoute=$(ip route show dev ${builder_config_interface} | grep -i 'default via'| awk '{print $3 }' | head -n 1 ) if [[ -z "${ifDefaultRoute=x}" ]]; then @@ -37,7 +37,7 @@ getMyDefaultRoute() { getMyBroadcast() { if [[ -z "${builder_config_interface+x}" ]]; then - echo $(ip -o -4 addr list $(ip route show 0.0.0.0/0 | awk '{print $5}') | grep brd | sed -e 's/^.* brd \([0-9\.]*\) .*$/\1/' ) + echo $(ip -o -4 addr list $(ip route show 0.0.0.0/0 | awk '{print $5}' | head -n 1) | grep brd | sed -e 's/^.* brd \([0-9\.]*\) .*$/\1/' ) else echo $(ip -o -4 addr list ${builder_config_interface} | grep brd | sed -e 's/^.* brd \([0-9\.]*\) .*$/\1/') fi