diff --git a/.github/workflows/build-container-images.yml b/.github/workflows/build-container-images.yml new file mode 100644 index 00000000..f52a8d51 --- /dev/null +++ b/.github/workflows/build-container-images.yml @@ -0,0 +1,75 @@ +# /******************************************************************************** +# * Copyright (c) 2023 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ + +name: Build SDV application container images +on: + pull_request: + workflow_dispatch: + +jobs: + build-container-images: + name: Build Container Images + runs-on: ubuntu-22.04 + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Update apt + run: sudo apt-get update -y + + - name: Install tools + run: sudo apt-get install -y --no-install-recommends socat file gawk wget git diffstat unzip texinfo gcc build-essential chrpath socat cpio python3 python3-pip python3-pexpect xz-utils debianutils iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev pylint xterm python3-subunit mesa-common-dev zstd liblz4-tool tmux mc skopeo fdisk ruby-full jq libvirt-clients libvirt-daemon-system qemu-system-x86 qemu-system-arm qemu-kvm squashfs-tools rauc python3-newt ca-certificates curl gnupg lsb-release + + - name: Install kas + run: sudo pip3 install kas + + - name: Cache Downloads + id: cache-downloads + uses: actions/cache@v3 + with: + path: build/downloads + key: bb-downloads + + - name: Cache SState + id: cache-sstate + uses: actions/cache@v3 + with: + path: build/sstate-cache + key: bb-sstate-cache + + - name: Cache Local + id: cache-local + uses: actions/cache@v3 + with: + path: build/cache + key: bb-cache-local + + - name: Build container images for QEMU x86-64 + run: kas build kas/.config-kirkstone.yaml --target packagegroup-sdv-container-images + + - name: Upload QEMU x86-64 images + uses: actions/upload-artifact@v3 + with: + name: AppContainerImages_QEMUx86-64 + if-no-files-found: error + path: build/tmp/deploy/images/qemux86-64/*qemux86-64-oci.tar + + - name: Build container images for Raspberry Pi 4 + run: kas build kas/.config-kirkstone-rpi4.yaml --target packagegroup-sdv-container-images + + - name: Upload Raspberry Pi 4 (64bit) images + uses: actions/upload-artifact@v3 + with: + name: AppContainerImages_RaspberryPi4-64 + if-no-files-found: error + path: build/tmp/deploy/images/raspberrypi4-64/*raspberrypi4-64-oci.tar diff --git a/kas/.config-kirkstone-rpi4.yaml b/kas/.config-kirkstone-rpi4.yaml index c33a2a59..422d58b6 100644 --- a/kas/.config-kirkstone-rpi4.yaml +++ b/kas/.config-kirkstone-rpi4.yaml @@ -79,3 +79,4 @@ repos: meta-leda-bsp: meta-leda-components: meta-leda-distro: + meta-leda-distro-container: diff --git a/kas/.config-kirkstone.yaml b/kas/.config-kirkstone.yaml index 06e8f7d3..dc25b4f0 100644 --- a/kas/.config-kirkstone.yaml +++ b/kas/.config-kirkstone.yaml @@ -79,3 +79,4 @@ repos: meta-leda-bsp: meta-leda-components: meta-leda-distro: + meta-leda-distro-container: diff --git a/kas/.config-master.yaml b/kas/.config-master.yaml index 7b2be19b..4d56d548 100644 --- a/kas/.config-master.yaml +++ b/kas/.config-master.yaml @@ -71,3 +71,4 @@ repos: meta-leda-bsp: meta-leda-components: meta-leda-distro: + meta-leda-distro-container: diff --git a/meta-leda-distro-container/recipes-sdv/images/sdv-image-container.bb b/meta-leda-distro-container/recipes-sdv/images/sdv-image-container.bb index f12f99a7..72faf31e 100644 --- a/meta-leda-distro-container/recipes-sdv/images/sdv-image-container.bb +++ b/meta-leda-distro-container/recipes-sdv/images/sdv-image-container.bb @@ -30,10 +30,10 @@ IMAGE_INSTALL = " \ # If the following is configured in local.conf (or the distro): # PACKAGE_EXTRA_ARCHS:append = " container-dummy-provides" -# +# # it has been explicitly # indicated that we don't want or need a shell, so we'll # add the dummy provides. -# +# # This is required, since there are postinstall scripts in base-files and base-passwd # that reference /bin/sh and we'll get a rootfs error if there's no shell or no dummy # provider. @@ -49,3 +49,18 @@ rootfs_fixup_var_volatile () { install -m 755 -d ${IMAGE_ROOTFS}/${localstatedir}/volatile/log } +# create stable symlinks to the latest container image +IMAGE_CMD:append:oci() { + cd ${IMGDEPLOYDIR} + + if [ -n "${OCI_IMAGE_TAR_OUTPUT}" ]; then + + cd $image_name + tar -cf "../$image_name.tar" * + cd - + + ln -sf "$image_name.tar" "${IMAGE_BASENAME}-${MACHINE}-oci.tar" + fi + + ln -sf $image_name ${IMAGE_BASENAME}-${MACHINE}-oci +} diff --git a/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb b/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb new file mode 100644 index 00000000..282a8944 --- /dev/null +++ b/meta-leda-distro-container/recipes-sdv/packagegroups/packagegroup-sdv-container-images.bb @@ -0,0 +1,21 @@ +# /******************************************************************************** +# * Copyright (c) 2023 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ + +SUMMARY = "SDV application container images" +DESCRIPTION = "Packages creating application images to be run as containers" + +inherit packagegroup + +RDEPENDS:${PN} = "\ + self-update-agent-container \ +" diff --git a/meta-leda-distro-container/recipes-sdv/sdv-containers/cloudagent-container_git.bb b/meta-leda-distro-container/recipes-sdv/sdv-containers/cloudagent-container_git.bb index 96af4233..57300fa2 100644 --- a/meta-leda-distro-container/recipes-sdv/sdv-containers/cloudagent-container_git.bb +++ b/meta-leda-distro-container/recipes-sdv/sdv-containers/cloudagent-container_git.bb @@ -13,17 +13,11 @@ SUMMARY = "SDV Cloud Connector container image" DESCRIPTION = "Docker container of the Eclipse Kanto Cloud Connector for IoT Suite" - -SRC_URI += "file://LICENSE" - -# According to https://wiki.yoctoproject.org/wiki/License_Infrastructure_Interest_Group LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=d9fc0efef5228704e7f5b37f27192723" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -# Ensure we're building a container image include images/sdv-image-container.bb -# Shell may be needed IMAGE_INSTALL += " \ busybox \ kanto-suite-connector \ diff --git a/meta-leda-distro-container/recipes-sdv/sdv-containers/cyclonedds-example-container_0.1.bb b/meta-leda-distro-container/recipes-sdv/sdv-containers/cyclonedds-example-container_0.1.bb index 78f57727..9a396bcd 100644 --- a/meta-leda-distro-container/recipes-sdv/sdv-containers/cyclonedds-example-container_0.1.bb +++ b/meta-leda-distro-container/recipes-sdv/sdv-containers/cyclonedds-example-container_0.1.bb @@ -14,7 +14,7 @@ SUMMARY = "SDV container images to demonstrate CycloneDDS" DESCRIPTION ="The resulting image contains all the python examples from the CycloneDDS project" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" require ../images/sdv-image-container.bb @@ -25,18 +25,3 @@ IMAGE_INSTALL += " \ " OCI_IMAGE_TAG = "cyclonedds-example:${PV}" - -IMAGE_CMD:append:oci() { - cd ${IMGDEPLOYDIR} - - if [ -n "${OCI_IMAGE_TAR_OUTPUT}" ]; then - - cd $image_name - tar -cf "../$image_name.tar" * - cd - - - ln -sf "$image_name.tar" "${IMAGE_BASENAME}-${MACHINE}-oci.tar" - fi - - ln -sf $image_name ${IMAGE_BASENAME}-${MACHINE}-oci -} diff --git a/meta-leda-distro-container/recipes-sdv/sdv-containers/files/LICENSE b/meta-leda-distro-container/recipes-sdv/sdv-containers/files/LICENSE deleted file mode 100644 index d6456956..00000000 --- a/meta-leda-distro-container/recipes-sdv/sdv-containers/files/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/meta-leda-distro-container/recipes-sdv/sdv-containers/self-update-agent-container_git.bb b/meta-leda-distro-container/recipes-sdv/sdv-containers/self-update-agent-container_git.bb new file mode 100644 index 00000000..30d27432 --- /dev/null +++ b/meta-leda-distro-container/recipes-sdv/sdv-containers/self-update-agent-container_git.bb @@ -0,0 +1,28 @@ +# /******************************************************************************** +# * Copyright (c) 2023 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ + +SUMMARY = "Self Update Agent container image" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +require ../images/sdv-image-container.bb + +IMAGE_INSTALL += " \ + busybox \ + leda-contrib-self-update-agent \ + leda-contrib-self-update-agent-data \ + " + +OCI_IMAGE_TAG = "self-update-agent:latest" +OCI_IMAGE_ENTRYPOINT = "/usr/bin/self-update-agent" +OCI_IMAGE_ENTRYPOINT_ARGS = "-p /data/selfupdates --host mosquitto:1883"