Skip to content

Fix: Backend tag into docker compose file#236

Merged
hiltonlima merged 3 commits intov2.10-beta3+spring2024from
update_docker_compose
Mar 20, 2024
Merged

Fix: Backend tag into docker compose file#236
hiltonlima merged 3 commits intov2.10-beta3+spring2024from
update_docker_compose

Conversation

@hiltonlima
Copy link
Copy Markdown
Contributor

@hiltonlima hiltonlima commented Mar 20, 2024

Backend tag/sha: e182d0f

fix update.sh to allow use tag withou branch linked

fix update.sh to allow use tag withou branch linked
@hiltonlima hiltonlima merged commit 89638c7 into v2.10-beta3+spring2024 Mar 20, 2024
@hiltonlima hiltonlima deleted the update_docker_compose branch March 20, 2024 20:01
hiltonlima added a commit that referenced this pull request Apr 19, 2024
* v2.10+spring2024: (25 commits)
  Update user guide (#251)
  Build docker iamges using cache
  Update user guide
  update docker compose
  Update backend
  Remove version (obsolete)
  Update script improviment
  Update depedencies script
  Fix: Backend tag into docker compose file (#236)
  Update backend
  Udated back sha in docker-compose file
  Revert backend sha in docker compose gile
  Updated docker compose file
  Updated backend submodule
  Updated backend
  Fix installation error: Remove libssl-dev version (#203)
  Update mapping in docker run command (#201)
  Updated docker-compose
  Updated backend submodule
  Add data model mapping to docker command (#199)
  ...

# Conflicts:
#	docker-compose.yml
#	docs/Matter_TH_User_Guide/Matter_TH_User_Guide.adoc
#	docs/Matter_TH_User_Guide/Matter_TH_User_Guide.pdf
#	scripts/ubuntu/1-install-dependencies.sh
#	scripts/ubuntu/auto-update.sh
#	scripts/update.sh
hiltonlima added a commit that referenced this pull request Apr 19, 2024
* Fixed image tag for both frontend and backend

* Updated sample semi-automated command (#190)

* Update Matter_TH_User_Guide.adoc

* Add files via upload

* Updated backend SHA (#193)

* Updated backend SHA in docker-compose file

* Change the user guide to emphasize the new distribution method. (#197)

* user guide adjustements for the new distribution approach.

* Update docs/Matter_TH_User_Guide/Matter_TH_User_Guide.adoc

Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>

---------

Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>

* Add data model mapping to docker command (#199)

* Update user guide with data model volume mapping

* Fix mapping

* Updated backend submodule

* Updated docker-compose

* Update mapping in docker run command (#201)

* Fix installation error: Remove libssl-dev version (#203)

* Remove lib version

* adding comments

* Using satisfy

* Using satisfy

* uncomment the last line

* remove unsed

* Adding linux-modules-extra-raspi package

* Updated backend

* Updated backend submodule

* Updated docker compose file

* Revert backend sha in docker compose gile

* Udated back sha in docker-compose file

* Update backend

* Fix: Backend tag into docker compose file (#236)

* update docker compose
fix update.sh to allow use tag withou branch linked

* update backend commit

* update backend commit

* Update depedencies script

* Update script improviment

* Remove version (obsolete)

* Update backend

* update docker compose

* Update user guide

* Build docker iamges using cache

* Update user guide (#251)

* update user guide pdf file

* Fix backend sha

* Remove unnecessary file

* Remove unnecessary file

---------

Co-authored-by: Suraj Seenivasan <suraj@graniteriverlabs.in>
Co-authored-by: Romulo Quidute Filho <116586593+rquidute@users.noreply.github.com>
Co-authored-by: Romulo Quidute Filho <rquidute@apple.com>
Co-authored-by: fabiowmm <116586985+fabiowmm@users.noreply.github.com>
Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>
raul-marquez-csa added a commit that referenced this pull request Jul 4, 2024
* Fixed image tag for both frontend and backend

* Updated sample semi-automated command (#190)

* Update Matter_TH_User_Guide.adoc

* Add files via upload

* Updated backend SHA (#193)

* Updated backend SHA in docker-compose file

* Change the user guide to emphasize the new distribution method. (#197)

* user guide adjustements for the new distribution approach.

* Update docs/Matter_TH_User_Guide/Matter_TH_User_Guide.adoc

Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>

---------

Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>

* Add data model mapping to docker command (#199)

* Update user guide with data model volume mapping

* Fix mapping

* Updated backend submodule

* Updated docker-compose

* Update mapping in docker run command (#201)

* Fix installation error: Remove libssl-dev version (#203)

* Remove lib version

* adding comments

* Using satisfy

* Using satisfy

* uncomment the last line

* remove unsed

* Adding linux-modules-extra-raspi package

* Updated backend

* Updated backend submodule

* Updated docker compose file

* Revert backend sha in docker compose gile

* Udated back sha in docker-compose file

* Update backend

* Fix: Backend tag into docker compose file (#236)

* update docker compose
fix update.sh to allow use tag withou branch linked

* update backend commit

* update backend commit

* Update depedencies script

* Update script improviment

* Remove version (obsolete)

* Update backend

* update docker compose

* Update user guide

* Build docker iamges using cache

* Update user guide (#251)

* Fix libglib2.0-dev version

* Verify docker.download.com is reachable before attempting to install the Docker Package Repo in 1-install-dependencies.sh (#270)

* Update 1-install-dependendcies.sh docker curl

Updated
`curl -fsSL https://download.docker.com/linux/ubuntu/gpg`
To
`curl -4fsSL https://download.docker.com/linux/ubuntu/gpg`

This forces curl to use IPv4 addresses only, excluding IPv6.

This has randomly caused the curl call to fail, failing the 
TH installation.

Solution taken from this Stackoverflow thread
https://stackoverflow.com/questions/48056566/could-not-resolve-host-download-docker-com-while-installing-docker-ce

* Update 1-install-dependendcies.sh

* Update 1-install-dependendcies.sh - testing

* testing

* testing

* testing

* Restores install-pi-dependencies.sh and auto-install.sh
Adds explanation to retry logic

* Missed including this file....

* Fix docker installation (#277)

(cherry picked from commit 2209d25)

* Update backend Commit SHA

* Update docker image tag

* update release links

* Update TH user guide

* Update backend SHA

* Update user guide

* Update user guide

* Update backend tag

* Fix / update TH version info

* Adds db version info to th version info

* Adds proxy version info to TH version info

* Fixes commit message breaking the borders when multiline or too long

* Adds storage info to system information

* Splits os and network info into their own cmd arguments

* Adds usage at the end of any info

* Fix backend and frontend container names

* Adds extra error message info

* Updates TH components labels

* Refactors version info, adds container running check

* Removes docker containers script as it's redundant now

* Renames os script to th-system

* Renames network script to th-network

* Updates usage text and labels

* Minor error message update

* Adds new option to show docker logs

* Renames th-net-dut script to th-dut

* Updated label to docker compose version

* Removes unused comment

* Updates config.py file location (evaluates 2 locations)

* Gets fall2024 files

* Restores .gitmodules

* Restores .gitmodules

* Sets test_collections/matter/config.py as only file location

---------

Co-authored-by: Hilton Lima <hilton_lima@apple.com>
Co-authored-by: Suraj Seenivasan <suraj@graniteriverlabs.in>
Co-authored-by: Romulo Quidute Filho <116586593+rquidute@users.noreply.github.com>
Co-authored-by: Romulo Quidute Filho <rquidute@apple.com>
Co-authored-by: fabiowmm <116586985+fabiowmm@users.noreply.github.com>
Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>
Co-authored-by: hiltonlima <116589806+hiltonlima@users.noreply.github.com>
hiltonlima added a commit that referenced this pull request Aug 16, 2024
* Suport for Ubuntu Server 24.04 LTS (#280)

* update packages version

* auto-install script refactoring

* Add wifi connect helper script

* Adding commom ble packages

* Update scripts/pi-setup/install-pi-dependencies.sh

* Improving docker instalation script

* Improving scripts log

* Improving scripts log

* Improving scripts log

* remove unused code

* improve utils script

* improve utils script

* fix order

* PR review

* PR review

* Update backend SHA

* Fix CLI dependencies installation

* Fix CLI dependencies installation

* update backend sha

* update backend sha

* update backend sha

* Do not use apt in bash

* update backend sha

* Update backend sha

* Update scripts/ubuntu/auto-update.sh

Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>

---------

Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>

* TH Doctor Update - July 2024 (#305)

* Fixed image tag for both frontend and backend

* Updated sample semi-automated command (#190)

* Update Matter_TH_User_Guide.adoc

* Add files via upload

* Updated backend SHA (#193)

* Updated backend SHA in docker-compose file

* Change the user guide to emphasize the new distribution method. (#197)

* user guide adjustements for the new distribution approach.

* Update docs/Matter_TH_User_Guide/Matter_TH_User_Guide.adoc

Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>

---------

Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>

* Add data model mapping to docker command (#199)

* Update user guide with data model volume mapping

* Fix mapping

* Updated backend submodule

* Updated docker-compose

* Update mapping in docker run command (#201)

* Fix installation error: Remove libssl-dev version (#203)

* Remove lib version

* adding comments

* Using satisfy

* Using satisfy

* uncomment the last line

* remove unsed

* Adding linux-modules-extra-raspi package

* Updated backend

* Updated backend submodule

* Updated docker compose file

* Revert backend sha in docker compose gile

* Udated back sha in docker-compose file

* Update backend

* Fix: Backend tag into docker compose file (#236)

* update docker compose
fix update.sh to allow use tag withou branch linked

* update backend commit

* update backend commit

* Update depedencies script

* Update script improviment

* Remove version (obsolete)

* Update backend

* update docker compose

* Update user guide

* Build docker iamges using cache

* Update user guide (#251)

* Fix libglib2.0-dev version

* Verify docker.download.com is reachable before attempting to install the Docker Package Repo in 1-install-dependencies.sh (#270)

* Update 1-install-dependendcies.sh docker curl

Updated
`curl -fsSL https://download.docker.com/linux/ubuntu/gpg`
To
`curl -4fsSL https://download.docker.com/linux/ubuntu/gpg`

This forces curl to use IPv4 addresses only, excluding IPv6.

This has randomly caused the curl call to fail, failing the 
TH installation.

Solution taken from this Stackoverflow thread
https://stackoverflow.com/questions/48056566/could-not-resolve-host-download-docker-com-while-installing-docker-ce

* Update 1-install-dependendcies.sh

* Update 1-install-dependendcies.sh - testing

* testing

* testing

* testing

* Restores install-pi-dependencies.sh and auto-install.sh
Adds explanation to retry logic

* Missed including this file....

* Fix docker installation (#277)

(cherry picked from commit 2209d25)

* Update backend Commit SHA

* Update docker image tag

* update release links

* Update TH user guide

* Update backend SHA

* Update user guide

* Update user guide

* Update backend tag

* Fix / update TH version info

* Adds db version info to th version info

* Adds proxy version info to TH version info

* Fixes commit message breaking the borders when multiline or too long

* Adds storage info to system information

* Splits os and network info into their own cmd arguments

* Adds usage at the end of any info

* Fix backend and frontend container names

* Adds extra error message info

* Updates TH components labels

* Refactors version info, adds container running check

* Removes docker containers script as it's redundant now

* Renames os script to th-system

* Renames network script to th-network

* Updates usage text and labels

* Minor error message update

* Adds new option to show docker logs

* Renames th-net-dut script to th-dut

* Updated label to docker compose version

* Removes unused comment

* Updates config.py file location (evaluates 2 locations)

* Gets fall2024 files

* Restores .gitmodules

* Restores .gitmodules

* Sets test_collections/matter/config.py as only file location

---------

Co-authored-by: Hilton Lima <hilton_lima@apple.com>
Co-authored-by: Suraj Seenivasan <suraj@graniteriverlabs.in>
Co-authored-by: Romulo Quidute Filho <116586593+rquidute@users.noreply.github.com>
Co-authored-by: Romulo Quidute Filho <rquidute@apple.com>
Co-authored-by: fabiowmm <116586985+fabiowmm@users.noreply.github.com>
Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>
Co-authored-by: hiltonlima <116589806+hiltonlima@users.noreply.github.com>

* Update Backend SHA

* Update backend SHA

* Version readability improvments

* Update backend sha

* Ubuntu 22.04 is not more supported (#321)

* check ubuntu version

* update backend sha

* fix validation

* Update error message

* Update backend sha

* Update User Guide with info about Certification Mode (#329)

* Update User Guide With New Ubuntu Version (#318)

* Update the User Guide with the new Ubuntu version

* Update the User Guide PDF file

* Update backend sha

* Update Backend SHA

* Update frontend

* Update frontend SHA

* update docker compose

* Update backend SHA

---------

Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>
Co-authored-by: Raul Marquez <130402456+raul-marquez-csa@users.noreply.github.com>
Co-authored-by: Suraj Seenivasan <suraj@graniteriverlabs.in>
Co-authored-by: Romulo Quidute Filho <116586593+rquidute@users.noreply.github.com>
Co-authored-by: Romulo Quidute Filho <rquidute@apple.com>
Co-authored-by: fabiowmm <116586985+fabiowmm@users.noreply.github.com>
Co-authored-by: Raul Marquez <rmarquez@csa-iot.org>
Co-authored-by: antonio-amjr <116589331+antonio-amjr@users.noreply.github.com>
hiltonlima added a commit that referenced this pull request Aug 27, 2024
* Suport for Ubuntu Server 24.04 LTS (#280)

* update packages version

* auto-install script refactoring

* Add wifi connect helper script

* Adding commom ble packages

* Update scripts/pi-setup/install-pi-dependencies.sh

* Improving docker instalation script

* Improving scripts log

* Improving scripts log

* Improving scripts log

* remove unused code

* improve utils script

* improve utils script

* fix order

* PR review

* PR review

* Update backend SHA

* Fix CLI dependencies installation

* Fix CLI dependencies installation

* update backend sha

* update backend sha

* update backend sha

* Do not use apt in bash

* update backend sha

* Update backend sha

* Update scripts/ubuntu/auto-update.sh

Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>

---------

Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>

* TH Doctor Update - July 2024 (#305)

* Fixed image tag for both frontend and backend

* Updated sample semi-automated command (#190)

* Update Matter_TH_User_Guide.adoc

* Add files via upload

* Updated backend SHA (#193)

* Updated backend SHA in docker-compose file

* Change the user guide to emphasize the new distribution method. (#197)

* user guide adjustements for the new distribution approach.

* Update docs/Matter_TH_User_Guide/Matter_TH_User_Guide.adoc

Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>

---------

Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>

* Add data model mapping to docker command (#199)

* Update user guide with data model volume mapping

* Fix mapping

* Updated backend submodule

* Updated docker-compose

* Update mapping in docker run command (#201)

* Fix installation error: Remove libssl-dev version (#203)

* Remove lib version

* adding comments

* Using satisfy

* Using satisfy

* uncomment the last line

* remove unsed

* Adding linux-modules-extra-raspi package

* Updated backend

* Updated backend submodule

* Updated docker compose file

* Revert backend sha in docker compose gile

* Udated back sha in docker-compose file

* Update backend

* Fix: Backend tag into docker compose file (#236)

* update docker compose
fix update.sh to allow use tag withou branch linked

* update backend commit

* update backend commit

* Update depedencies script

* Update script improviment

* Remove version (obsolete)

* Update backend

* update docker compose

* Update user guide

* Build docker iamges using cache

* Update user guide (#251)

* Fix libglib2.0-dev version

* Verify docker.download.com is reachable before attempting to install the Docker Package Repo in 1-install-dependencies.sh (#270)

* Update 1-install-dependendcies.sh docker curl

Updated
`curl -fsSL https://download.docker.com/linux/ubuntu/gpg`
To
`curl -4fsSL https://download.docker.com/linux/ubuntu/gpg`

This forces curl to use IPv4 addresses only, excluding IPv6.

This has randomly caused the curl call to fail, failing the 
TH installation.

Solution taken from this Stackoverflow thread
https://stackoverflow.com/questions/48056566/could-not-resolve-host-download-docker-com-while-installing-docker-ce

* Update 1-install-dependendcies.sh

* Update 1-install-dependendcies.sh - testing

* testing

* testing

* testing

* Restores install-pi-dependencies.sh and auto-install.sh
Adds explanation to retry logic

* Missed including this file....

* Fix docker installation (#277)

(cherry picked from commit 2209d25)

* Update backend Commit SHA

* Update docker image tag

* update release links

* Update TH user guide

* Update backend SHA

* Update user guide

* Update user guide

* Update backend tag

* Fix / update TH version info

* Adds db version info to th version info

* Adds proxy version info to TH version info

* Fixes commit message breaking the borders when multiline or too long

* Adds storage info to system information

* Splits os and network info into their own cmd arguments

* Adds usage at the end of any info

* Fix backend and frontend container names

* Adds extra error message info

* Updates TH components labels

* Refactors version info, adds container running check

* Removes docker containers script as it's redundant now

* Renames os script to th-system

* Renames network script to th-network

* Updates usage text and labels

* Minor error message update

* Adds new option to show docker logs

* Renames th-net-dut script to th-dut

* Updated label to docker compose version

* Removes unused comment

* Updates config.py file location (evaluates 2 locations)

* Gets fall2024 files

* Restores .gitmodules

* Restores .gitmodules

* Sets test_collections/matter/config.py as only file location

---------

Co-authored-by: Hilton Lima <hilton_lima@apple.com>
Co-authored-by: Suraj Seenivasan <suraj@graniteriverlabs.in>
Co-authored-by: Romulo Quidute Filho <116586593+rquidute@users.noreply.github.com>
Co-authored-by: Romulo Quidute Filho <rquidute@apple.com>
Co-authored-by: fabiowmm <116586985+fabiowmm@users.noreply.github.com>
Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>
Co-authored-by: hiltonlima <116589806+hiltonlima@users.noreply.github.com>

* Update Backend SHA

* Update backend SHA

* Version readability improvments

* Update backend sha

* Ubuntu 22.04 is not more supported (#321)

* check ubuntu version

* update backend sha

* fix validation

* Update error message

* Update backend sha

* Update User Guide with info about Certification Mode (#329)

* Update User Guide With New Ubuntu Version (#318)

* Update the User Guide with the new Ubuntu version

* Update the User Guide PDF file

* Update backend sha

* Update Backend SHA

* Update frontend

* Update frontend SHA

* update docker compose

* Update backend SHA

---------

Co-authored-by: Carolina Lopes <116589288+ccruzagralopes@users.noreply.github.com>
Co-authored-by: Raul Marquez <130402456+raul-marquez-csa@users.noreply.github.com>
Co-authored-by: Suraj Seenivasan <suraj@graniteriverlabs.in>
Co-authored-by: Romulo Quidute Filho <116586593+rquidute@users.noreply.github.com>
Co-authored-by: Romulo Quidute Filho <rquidute@apple.com>
Co-authored-by: fabiowmm <116586985+fabiowmm@users.noreply.github.com>
Co-authored-by: Raul Marquez <rmarquez@csa-iot.org>
Co-authored-by: antonio-amjr <116589331+antonio-amjr@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants