From 2a6ff99e5fec8cdb7b05a5b1ea9a1188ff960d33 Mon Sep 17 00:00:00 2001 From: Jason Fox Date: Mon, 24 Jul 2023 12:19:39 +0200 Subject: [PATCH 01/10] Add webhook bash script --- .github/fiware/image-clone.sh | 35 +++++++++++++++++++++++++++++++++++ README.md | 8 ++++---- 2 files changed, 39 insertions(+), 4 deletions(-) create mode 100755 .github/fiware/image-clone.sh diff --git a/.github/fiware/image-clone.sh b/.github/fiware/image-clone.sh new file mode 100755 index 00000000..b38bfbd6 --- /dev/null +++ b/.github/fiware/image-clone.sh @@ -0,0 +1,35 @@ +set -e + +SOURCE="telefonicaiot/iotagent-ul" +DOCKER_TARGET="fiware/iotagent-ul" +QUAY_TARGET="quay.io/fiware/iotagent-ul" + +# DOCKER_TARGET="fiware/$(basename $(git rev-parse --show-toplevel))" +# QUAY_TARGET="quay.io/fiware/$(basename $(git rev-parse --show-toplevel))" + +VERSION=$(git describe --tags $(git rev-list --tags --max-count=1)) + +function clone { + echo 'cloning from '"$1 $2"' to '"$3" + docker pull -q "$1":"$2" + docker tag "$1":"$2" "$3":"$2" + + if ! [ -z "$4" ]; then + echo 'pushing '"$1 $2"' to latest' + docker tag "$1":"$2" "$3":latest + docker push -q "$3":latest + fi +} + +for i in "$@" ; do + if [[ $i == "docker" ]]; then + + clone "$SOURCE" "$VERSION" "$DOCKER_TARGET" true + clone "$SOURCE" "$VERSION"-distroless "$DOCKER_TARGET"-distroless + fi + if [[ $i == "quay" ]]; then + clone "$SOURCE" "$VERSION" "$QUAY_TARGET" true + clone "$SOURCE" "$VERSION"-distroless "$QUAY_TARGET"-distroless + fi + echo "" +done \ No newline at end of file diff --git a/README.md b/README.md index 15ce543e..da52dee8 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ [![FIWARE IoT Agents](https://nexus.lab.fiware.org/static/badges/chapters/iot-agents.svg)](https://www.fiware.org/developers/catalogue/) [![License: APGL](https://img.shields.io/github/license/telefonicaid/iotagent-ul.svg)](https://opensource.org/licenses/AGPL-3.0) -[![Docker badge](https://img.shields.io/docker/pulls/fiware/iotagent-ul.svg)](https://hub.docker.com/r/fiware/iotagent-ul/) -[![Support badge](https://nexus.lab.fiware.org/repository/raw/public/badges/stackoverflow/iot-agents.svg)](https://stackoverflow.com/questions/tagged/fiware+iot) +[![Docker badge](https://img.shields.io/badge/quay.io-fiware%2Fiotagent--ul-grey?logo=red%20hat&labelColor=EE0000)](https://quay.io/repository/fiware/iotagent-ul) +[![Support badge](https://img.shields.io/badge/tag-fiware+iot-orange.svg?logo=stackoverflow)](https://stackoverflow.com/questions/tagged/fiware+iot)
[![Documentation badge](https://img.shields.io/readthedocs/fiware-iotagent-ul.svg)](http://fiware-iotagent-ul.readthedocs.io/en/latest/?badge=latest) [![CI](https://github.com/telefonicaid/iotagent-ul/workflows/CI/badge.svg)](https://github.com/telefonicaid/iotagent-ul/actions?query=workflow%3ACI) @@ -24,8 +24,8 @@ library's GitHub repository. This project is part of [FIWARE](https://www.fiware.org/). For more information check the FIWARE Catalogue entry for the [IoT Agents](https://github.com/Fiware/catalogue/tree/master/iot-agents). -| :books: [Documentation](https://fiware-iotagent-ul.readthedocs.io) | :mortar_board: [Academy](https://fiware-academy.readthedocs.io/en/latest/iot-agents/idas) | :whale: [Docker Hub](https://hub.docker.com/r/fiware/iotagent-ul/) | :dart: [Roadmap](https://github.com/telefonicaid/iotagent-ul/blob/master/docs/roadmap.md) | -| ------------------------------------------------------------------ | ----------------------------------------------------------------------------------------- | ------------------------------------------------------------------ | ----------------------------------------------------------------------------------------- | +| :books: [Documentation](https://fiware-iotagent-ul.readthedocs.io) | :mortar_board: [Academy](https://fiware-academy.readthedocs.io/en/latest/iot-agents/idas) | [quay.io](https://quay.io/repository/fiware/iotagent-ul) | :dart: [Roadmap](https://github.com/telefonicaid/iotagent-ul/blob/master/docs/roadmap.md) | +| ------------------------------------------------------------------ | ----------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------- | ## Contents From dbb15290822226b375946657e718573b8530597e Mon Sep 17 00:00:00 2001 From: Jason Fox Date: Mon, 24 Jul 2023 12:22:48 +0200 Subject: [PATCH 02/10] Fix year. --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index da52dee8..9533fc3b 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,10 @@ npm test The IoT Agent for Ultralight is licensed under [Affero General Public License (GPL) version 3](./LICENSE). -© 2022 Telefonica Investigación y Desarrollo, S.A.U +© 2023 Telefonica Investigación y Desarrollo, S.A.U + +
+Further information on the use of the AGPL open source license ### Are there any legal issues with AGPL 3.0? Is it safe for me to use? @@ -139,3 +142,5 @@ public statement as follows: > incorporate enhancements is considered a derivative work of the product. Software that merely uses or aggregates (i.e. > links to) an otherwise unmodified version of existing software is not considered a derivative work, and therefore it > does not need to be released as under the same license, or even released as open source. + +
From 85d99c50900eab5889cf1dbc76004ee40c2938b7 Mon Sep 17 00:00:00 2001 From: Jason Fox Date: Mon, 24 Jul 2023 12:31:48 +0200 Subject: [PATCH 03/10] Update image-clone.sh --- .github/fiware/image-clone.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/fiware/image-clone.sh b/.github/fiware/image-clone.sh index b38bfbd6..cc8e8c09 100755 --- a/.github/fiware/image-clone.sh +++ b/.github/fiware/image-clone.sh @@ -25,11 +25,11 @@ for i in "$@" ; do if [[ $i == "docker" ]]; then clone "$SOURCE" "$VERSION" "$DOCKER_TARGET" true - clone "$SOURCE" "$VERSION"-distroless "$DOCKER_TARGET"-distroless + clone "$SOURCE" "$VERSION"-distroless "$DOCKER_TARGET" fi if [[ $i == "quay" ]]; then clone "$SOURCE" "$VERSION" "$QUAY_TARGET" true - clone "$SOURCE" "$VERSION"-distroless "$QUAY_TARGET"-distroless + clone "$SOURCE" "$VERSION"-distroless "$QUAY_TARGET" fi echo "" -done \ No newline at end of file +done From 6d4421cde093aea74c850551e27e48abdd369a50 Mon Sep 17 00:00:00 2001 From: Jason Fox Date: Thu, 3 Aug 2023 16:24:41 +0200 Subject: [PATCH 04/10] Ignore FIWARE tag --- .github/fiware/image-clone.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/fiware/image-clone.sh b/.github/fiware/image-clone.sh index cc8e8c09..2a5aeaad 100755 --- a/.github/fiware/image-clone.sh +++ b/.github/fiware/image-clone.sh @@ -7,7 +7,7 @@ QUAY_TARGET="quay.io/fiware/iotagent-ul" # DOCKER_TARGET="fiware/$(basename $(git rev-parse --show-toplevel))" # QUAY_TARGET="quay.io/fiware/$(basename $(git rev-parse --show-toplevel))" -VERSION=$(git describe --tags $(git rev-list --tags --max-count=1)) +VERSION=$(git describe --exclude 'FIWARE*' --tags $(git rev-list --tags --max-count=1)) function clone { echo 'cloning from '"$1 $2"' to '"$3" From da2ab900008b6cdd70b5f6e0cdb16d17d8a6335d Mon Sep 17 00:00:00 2001 From: Jason Fox Date: Thu, 3 Aug 2023 20:05:13 +0200 Subject: [PATCH 05/10] Add push --- .github/fiware/image-clone.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/fiware/image-clone.sh b/.github/fiware/image-clone.sh index 2a5aeaad..5a3fa493 100755 --- a/.github/fiware/image-clone.sh +++ b/.github/fiware/image-clone.sh @@ -13,6 +13,7 @@ function clone { echo 'cloning from '"$1 $2"' to '"$3" docker pull -q "$1":"$2" docker tag "$1":"$2" "$3":"$2" + docker push -q "$3":"$2" if ! [ -z "$4" ]; then echo 'pushing '"$1 $2"' to latest' From 4012414102b8ce1c0ea1f0e11eabe8076e554f38 Mon Sep 17 00:00:00 2001 From: Jason Fox Date: Fri, 4 Aug 2023 13:54:06 +0200 Subject: [PATCH 06/10] Add clean --- .github/fiware/image-clone.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/fiware/image-clone.sh b/.github/fiware/image-clone.sh index 5a3fa493..0f8f00a5 100755 --- a/.github/fiware/image-clone.sh +++ b/.github/fiware/image-clone.sh @@ -34,3 +34,9 @@ for i in "$@" ; do fi echo "" done + +for i in "$@" ; do + if [[ $i == "clean" ]]; then + docker rmi -f $(docker images -a -q) | true + fi +done From 81b5732e003ce2badc60a63f21ed904a60ab3038 Mon Sep 17 00:00:00 2001 From: Jason Fox Date: Fri, 15 Sep 2023 11:42:11 +0200 Subject: [PATCH 07/10] Delete .github/fiware/image-clone.sh --- .github/fiware/image-clone.sh | 42 ----------------------------------- 1 file changed, 42 deletions(-) delete mode 100755 .github/fiware/image-clone.sh diff --git a/.github/fiware/image-clone.sh b/.github/fiware/image-clone.sh deleted file mode 100755 index 0f8f00a5..00000000 --- a/.github/fiware/image-clone.sh +++ /dev/null @@ -1,42 +0,0 @@ -set -e - -SOURCE="telefonicaiot/iotagent-ul" -DOCKER_TARGET="fiware/iotagent-ul" -QUAY_TARGET="quay.io/fiware/iotagent-ul" - -# DOCKER_TARGET="fiware/$(basename $(git rev-parse --show-toplevel))" -# QUAY_TARGET="quay.io/fiware/$(basename $(git rev-parse --show-toplevel))" - -VERSION=$(git describe --exclude 'FIWARE*' --tags $(git rev-list --tags --max-count=1)) - -function clone { - echo 'cloning from '"$1 $2"' to '"$3" - docker pull -q "$1":"$2" - docker tag "$1":"$2" "$3":"$2" - docker push -q "$3":"$2" - - if ! [ -z "$4" ]; then - echo 'pushing '"$1 $2"' to latest' - docker tag "$1":"$2" "$3":latest - docker push -q "$3":latest - fi -} - -for i in "$@" ; do - if [[ $i == "docker" ]]; then - - clone "$SOURCE" "$VERSION" "$DOCKER_TARGET" true - clone "$SOURCE" "$VERSION"-distroless "$DOCKER_TARGET" - fi - if [[ $i == "quay" ]]; then - clone "$SOURCE" "$VERSION" "$QUAY_TARGET" true - clone "$SOURCE" "$VERSION"-distroless "$QUAY_TARGET" - fi - echo "" -done - -for i in "$@" ; do - if [[ $i == "clean" ]]; then - docker rmi -f $(docker images -a -q) | true - fi -done From a7e0cc25c087e5f9a7a31ae18a7a7a9b370656de Mon Sep 17 00:00:00 2001 From: Jason Fox Date: Fri, 15 Sep 2023 13:39:10 +0200 Subject: [PATCH 08/10] Update README.md Co-authored-by: mapedraza <40356341+mapedraza@users.noreply.github.com> --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9533fc3b..7f4f29cd 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ [![FIWARE IoT Agents](https://nexus.lab.fiware.org/static/badges/chapters/iot-agents.svg)](https://www.fiware.org/developers/catalogue/) [![License: APGL](https://img.shields.io/github/license/telefonicaid/iotagent-ul.svg)](https://opensource.org/licenses/AGPL-3.0) -[![Docker badge](https://img.shields.io/badge/quay.io-fiware%2Fiotagent--ul-grey?logo=red%20hat&labelColor=EE0000)](https://quay.io/repository/fiware/iotagent-ul) +[![Quay badge](https://img.shields.io/badge/quay.io-fiware%2Fiotagent--ul-grey?logo=red%20hat&labelColor=EE0000)](https://quay.io/repository/fiware/iotagent-ul) +[![Docker badge](https://img.shields.io/badge/docker-telefonicaiot%2Fiotagent--ul-blue?logo=docker)](https://registry.hub.docker.com/r/telefonicaiot/iotagent-ul) [![Support badge](https://img.shields.io/badge/tag-fiware+iot-orange.svg?logo=stackoverflow)](https://stackoverflow.com/questions/tagged/fiware+iot)
[![Documentation badge](https://img.shields.io/readthedocs/fiware-iotagent-ul.svg)](http://fiware-iotagent-ul.readthedocs.io/en/latest/?badge=latest) From 1f01f3f9cd58946fb458ffdad4d5d62f1228dbb9 Mon Sep 17 00:00:00 2001 From: Jason Fox Date: Fri, 15 Sep 2023 13:39:15 +0200 Subject: [PATCH 09/10] Update README.md Co-authored-by: mapedraza <40356341+mapedraza@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7f4f29cd..aba79fd9 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ library's GitHub repository. This project is part of [FIWARE](https://www.fiware.org/). For more information check the FIWARE Catalogue entry for the [IoT Agents](https://github.com/Fiware/catalogue/tree/master/iot-agents). -| :books: [Documentation](https://fiware-iotagent-ul.readthedocs.io) | :mortar_board: [Academy](https://fiware-academy.readthedocs.io/en/latest/iot-agents/idas) | [quay.io](https://quay.io/repository/fiware/iotagent-ul) | :dart: [Roadmap](https://github.com/telefonicaid/iotagent-ul/blob/master/docs/roadmap.md) | +| :books: [Documentation](https://fiware-iotagent-ul.readthedocs.io) | :mortar_board: [Academy](https://fiware-academy.readthedocs.io/en/latest/iot-agents/idas) | [quay.io](https://quay.io/repository/fiware/iotagent-ul) | :whale: [Docker Hub](https://hub.docker.com/r/telefonicaiot/iotagent-ul) | :dart: [Roadmap](https://github.com/telefonicaid/iotagent-ul/blob/master/docs/roadmap.md) | | ------------------------------------------------------------------ | ----------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------- | From 757a922e66c7b431b137698fad71cf87229803bc Mon Sep 17 00:00:00 2001 From: Jason Fox Date: Fri, 15 Sep 2023 13:50:06 +0200 Subject: [PATCH 10/10] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aba79fd9..2bde7e67 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,10 @@ [![FIWARE IoT Agents](https://nexus.lab.fiware.org/static/badges/chapters/iot-agents.svg)](https://www.fiware.org/developers/catalogue/) [![License: APGL](https://img.shields.io/github/license/telefonicaid/iotagent-ul.svg)](https://opensource.org/licenses/AGPL-3.0) +[![Support badge](https://img.shields.io/badge/tag-fiware+iot-orange.svg?logo=stackoverflow)](https://stackoverflow.com/questions/tagged/fiware+iot) +
[![Quay badge](https://img.shields.io/badge/quay.io-fiware%2Fiotagent--ul-grey?logo=red%20hat&labelColor=EE0000)](https://quay.io/repository/fiware/iotagent-ul) [![Docker badge](https://img.shields.io/badge/docker-telefonicaiot%2Fiotagent--ul-blue?logo=docker)](https://registry.hub.docker.com/r/telefonicaiot/iotagent-ul) -[![Support badge](https://img.shields.io/badge/tag-fiware+iot-orange.svg?logo=stackoverflow)](https://stackoverflow.com/questions/tagged/fiware+iot)
[![Documentation badge](https://img.shields.io/readthedocs/fiware-iotagent-ul.svg)](http://fiware-iotagent-ul.readthedocs.io/en/latest/?badge=latest) [![CI](https://github.com/telefonicaid/iotagent-ul/workflows/CI/badge.svg)](https://github.com/telefonicaid/iotagent-ul/actions?query=workflow%3ACI) @@ -26,7 +27,7 @@ This project is part of [FIWARE](https://www.fiware.org/). For more information [IoT Agents](https://github.com/Fiware/catalogue/tree/master/iot-agents). | :books: [Documentation](https://fiware-iotagent-ul.readthedocs.io) | :mortar_board: [Academy](https://fiware-academy.readthedocs.io/en/latest/iot-agents/idas) | [quay.io](https://quay.io/repository/fiware/iotagent-ul) | :whale: [Docker Hub](https://hub.docker.com/r/telefonicaiot/iotagent-ul) | :dart: [Roadmap](https://github.com/telefonicaid/iotagent-ul/blob/master/docs/roadmap.md) | -| ------------------------------------------------------------------ | ----------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------- | +| ------------------------------------------------------------------ | ----------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------- | --- | ## Contents