Add README.md to compose applications

arduino-iot-cloud-provisioning/Dockerfile

@@ -1,57 +1,72 @@
 # Copyright (c) 2022 Arduino.cc
 #
 
-FROM golang:1.16.13-alpine3.15 AS build-arduino-cloud-cli
+FROM golang:1.16-alpine AS build-arduino-cloud-cli
+
 WORKDIR /go/src
-RUN set -ex \
-    && apk --no-cache add git \
-    && git clone -b 0.1.1 https://github.com/arduino/arduino-cloud-cli.git \
-    && cd arduino-cloud-cli \
-    && go build -o /go/bin/arduino-cloud-cli .
+RUN apk update \
+  && apk --no-cache add git \
+  && git clone -b 0.1.1 https://github.com/arduino/arduino-cloud-cli.git \
+  && cd arduino-cloud-cli \
+  && go build -o /go/bin/arduino-cloud-cli .
+
+FROM golang:1.19-alpine as build-go-app
 
-FROM golang:1.19-alpine3.16 as build-go-app
 WORKDIR /go/src
+
 ADD ./api /go/src
-RUN go mod download
-RUN go build -o /go/bin/x8-aiotcp-api .
+
+RUN go mod download \
+  && go build -o /go/bin/x8-aiotcp-api .
 
 FROM eclipse-mosquitto:2.0.13 AS op_tee_build
 
 # A bit ahead of 3.15.0, to include support for secure element control (used by SE05X)
 ENV OPTEE_CLIENT_VER "f4f54e5a76641fda22a49f00294771f948cd4c92"
 
 # build TEE client and headers
-RUN apk --no-cache add --virtual build-deps git build-base linux-headers &&\
-    git clone https://github.com/OP-TEE/optee_client.git &&\
-    cd optee_client && git checkout ${OPTEE_CLIENT_VER} &&\
-    git config --global user.email "you@example.com" &&\
-    git config --global user.name "Your Name" &&\
-    wget https://raw.githubusercontent.com/foundriesio/meta-lmp/101b2fcad5d762e70205ae10219eb4e063af59a9/meta-lmp-base/recipes-security/optee/optee-client/0001-FIO-extras-pkcs11-change-UUID-to-avoid-conflict-with.patch &&\
-    git am 0001-FIO-extras-pkcs11-change-UUID-to-avoid-conflict-with.patch &&\
-    wget https://raw.githubusercontent.com/foundriesio/meta-lmp/101b2fcad5d762e70205ae10219eb4e063af59a9/meta-lmp-base/recipes-security/optee/optee-client/0001-libckteec-add-support-for-ECDH-derive.patch &&\
-    git am 0001-libckteec-add-support-for-ECDH-derive.patch &&\
-    make -C libteec/ && make -C libseteec && make -C libckteec
+RUN apk --no-cache add --virtual build-deps build-base git linux-headers \
+  && git clone https://github.com/OP-TEE/optee_client.git \
+  && cd optee_client \
+  && git checkout ${OPTEE_CLIENT_VER}  \
+  && git config --global user.email "you@example.com" \
+  && git config --global user.name "Your Name" \
+  && wget https://raw.githubusercontent.com/foundriesio/meta-lmp/101b2fcad5d762e70205ae10219eb4e063af59a9/meta-lmp-base/recipes-security/optee/optee-client/0001-FIO-extras-pkcs11-change-UUID-to-avoid-conflict-with.patch \
+  && git am 0001-FIO-extras-pkcs11-change-UUID-to-avoid-conflict-with.patch \
+  && wget https://raw.githubusercontent.com/foundriesio/meta-lmp/101b2fcad5d762e70205ae10219eb4e063af59a9/meta-lmp-base/recipes-security/optee/optee-client/0001-libckteec-add-support-for-ECDH-derive.patch \
+  && git am 0001-libckteec-add-support-for-ECDH-derive.patch \
+  && make -C libteec/ \
+  && make -C libseteec \
+  && make -C libckteec
 
 # build libp11
 FROM eclipse-mosquitto:2.0.13 AS p11_build
+
 ENV LIBP11_VERSION=0.4.11
 
 RUN apk --no-cache add --virtual .build-deps autoconf automake build-base gettext openssl-dev libtool m4 readline-dev zlib-dev curl
-RUN curl -fsL https://github.com/OpenSC/libp11/releases/download/libp11-${LIBP11_VERSION}/libp11-${LIBP11_VERSION}.tar.gz -o libp11-${LIBP11_VERSION}.tar.gz &&\
-    tar -zxf libp11-${LIBP11_VERSION}.tar.gz &&\
-    rm libp11-${LIBP11_VERSION}.tar.gz &&\
-    cd libp11-${LIBP11_VERSION} &&\
-    ./configure &&\
-    make &&\
-    make install
+
+RUN curl -fsL https://github.com/OpenSC/libp11/releases/download/libp11-${LIBP11_VERSION}/libp11-${LIBP11_VERSION}.tar.gz -o libp11-${LIBP11_VERSION}.tar.gz \
+  && tar -zxf libp11-${LIBP11_VERSION}.tar.gz \
+  && rm libp11-${LIBP11_VERSION}.tar.gz \
+  && cd libp11-${LIBP11_VERSION} \
+  && ./configure \
+  && make \
+  && make install
 
 # copy data to final container
-FROM python:3.9-alpine3.16
+FROM python:3.9-alpine
 
 LABEL maintainer="Mattia Pennasilico <m.pennasilico@arduino.cc>"
 
 # install openssl1.1-compat
-RUN apk add --no-cache openssl openssl-dev
+RUN apk add --no-cache \
+  gnutls-utils \
+  curl \
+  jq \
+  opensc \
+  openssl \
+  openssl-dev 
 
 # copy libtee
 COPY --from=op_tee_build /optee_client/out/libteec/libteec.so* /usr/lib/
@@ -61,19 +76,9 @@ COPY --from=op_tee_build /optee_client/public/*.h /usr/include/
 
 # copy libp11
 COPY --from=p11_build /usr/lib/engines-1.1/pkcs11.so /usr/lib/engines-1.1/pkcs11.so
-RUN set -ex \
-    && cd /usr/lib/engines-1.1 \
-    && ln -s -f pkcs11.so libpkcs11.so
-
-# install additional tools
-RUN set -ex \
-    && apk --no-cache add opensc gnutls-utils curl openssl
-
 COPY ./iot-config.template /root/iot-config.template
-
-# install tool to parse json files from cmd line
-RUN set -ex \
-    && apk add --no-cache jq
+RUN cd /usr/lib/engines-1.1 \
+  && ln -s -f pkcs11.so libpkcs11.so
 
 # install arduino-cloud-cli
 COPY --from=build-arduino-cloud-cli /go/bin/arduino-cloud-cli /usr/bin/arduino-cloud-cli
@@ -101,4 +106,6 @@ COPY --from=build-go-app /go/bin/x8-aiotcp-api /
 # entrypoint
 COPY ./entrypoint.sh /
 RUN chmod 700 /entrypoint.sh
+
 ENTRYPOINT ["/entrypoint.sh"]
+

arduino-iot-cloud-provisioning/docker-compose.yml

@@ -1,10 +1,11 @@
+name: arduino-cloud-provisioning
+
 services:
-  arduino-iot-cloud-provisioning:
+
+  iot-cloud-provisioning:
     container_name: arduino-iot-cloud-provisioning
     image: hub.foundries.io/${FACTORY}/arduino-iot-cloud-provisioning:latest
     restart: unless-stopped
-    tty: true
-    read_only: false
     user: "0"
     environment:
     - 'DBUS_SYSTEM_BUS_ADDRESS=unix:path=/run/dbus/system_bus_socket'
@@ -14,3 +15,4 @@ services:
     - '/var:/var/secrets'
     devices:
     - '/dev/tee0'
+

arduino-ootb-python-devel/Dockerfile

@@ -7,89 +7,114 @@ FROM eclipse-mosquitto:2.0.13 AS op_tee_build
 ENV OPTEE_CLIENT_VER "f4f54e5a76641fda22a49f00294771f948cd4c92"
 
 # build TEE client and headers
-RUN apk --no-cache add --virtual build-deps git build-base linux-headers &&\
-    git clone https://github.com/OP-TEE/optee_client.git &&\
-    cd optee_client && git checkout ${OPTEE_CLIENT_VER} &&\
-    git config --global user.email "you@example.com" &&\
-    git config --global user.name "Your Name" &&\
-    wget https://raw.githubusercontent.com/foundriesio/meta-lmp/101b2fcad5d762e70205ae10219eb4e063af59a9/meta-lmp-base/recipes-security/optee/optee-client/0001-FIO-extras-pkcs11-change-UUID-to-avoid-conflict-with.patch &&\
-    git am 0001-FIO-extras-pkcs11-change-UUID-to-avoid-conflict-with.patch &&\
-    wget https://raw.githubusercontent.com/foundriesio/meta-lmp/101b2fcad5d762e70205ae10219eb4e063af59a9/meta-lmp-base/recipes-security/optee/optee-client/0001-libckteec-add-support-for-ECDH-derive.patch &&\
-    git am 0001-libckteec-add-support-for-ECDH-derive.patch &&\
-    make -C libteec/ && make -C libseteec && make -C libckteec
+RUN apk --no-cache add --virtual build-deps \
+    build-base \
+    git \
+    linux-headers \
+  && git clone https://github.com/OP-TEE/optee_client.git \
+  && cd optee_client \
+  && git checkout ${OPTEE_CLIENT_VER} \
+  && git config --global user.email "you@example.com" \
+  && git config --global user.name "Your Name" \
+  && wget https://raw.githubusercontent.com/foundriesio/meta-lmp/101b2fcad5d762e70205ae10219eb4e063af59a9/meta-lmp-base/recipes-security/optee/optee-client/0001-FIO-extras-pkcs11-change-UUID-to-avoid-conflict-with.patch \
+  && git am 0001-FIO-extras-pkcs11-change-UUID-to-avoid-conflict-with.patch \
+  && wget https://raw.githubusercontent.com/foundriesio/meta-lmp/101b2fcad5d762e70205ae10219eb4e063af59a9/meta-lmp-base/recipes-security/optee/optee-client/0001-libckteec-add-support-for-ECDH-derive.patch \
+  && git am 0001-libckteec-add-support-for-ECDH-derive.patch \
+  && make -C libteec/ \
+  && make -C libseteec \
+  && make -C libckteec
 
 # build libp11
 FROM eclipse-mosquitto:2.0.13 AS p11_build
+
 ENV LIBP11_VERSION=0.4.11
 
-RUN apk --no-cache add --virtual .build-deps autoconf automake build-base gettext openssl-dev libtool m4 readline-dev zlib-dev curl
-RUN curl -fsL https://github.com/OpenSC/libp11/releases/download/libp11-${LIBP11_VERSION}/libp11-${LIBP11_VERSION}.tar.gz -o libp11-${LIBP11_VERSION}.tar.gz &&\
-    tar -zxf libp11-${LIBP11_VERSION}.tar.gz &&\
-    rm libp11-${LIBP11_VERSION}.tar.gz &&\
-    cd libp11-${LIBP11_VERSION} &&\
-    ./configure &&\
-    make &&\
-    make install
+RUN apk --no-cache add --virtual .build-deps \
+  autoconf \
+  automake \
+  build-base \
+  curl \
+  gettext \
+  libtool \
+  m4 \
+  openssl-dev \
+  readline-dev \
+  zlib-dev
+
+RUN curl -fsL https://github.com/OpenSC/libp11/releases/download/libp11-${LIBP11_VERSION}/libp11-${LIBP11_VERSION}.tar.gz -o libp11-${LIBP11_VERSION}.tar.gz \
+  && tar -zxf libp11-${LIBP11_VERSION}.tar.gz \
+  && rm libp11-${LIBP11_VERSION}.tar.gz \
+  && cd libp11-${LIBP11_VERSION} \
+  && ./configure \
+  && make \
+  && make install
 
 # build kpn senml
 FROM python:3.9-alpine3.16 AS kpn_senml_build
 
-RUN set -ex \
-    && apk add --no-cache --virtual .build-dep \
-        git build-base python3-dev
-
-RUN set -ex \
-    && git clone https://github.com/kpn-iot/senml-python-library \
-    && cd senml-python-library \
-    && git checkout 562ab57920a7abe4b2f960a58b403966d065241b \
-    && python3 setup.py bdist_wheel \
-    && cd ..
+RUN apk add --no-cache --virtual .build-dep build-base git python3-dev
 
-RUN set -ex \
-    && apk del .build-dep
+RUN git clone https://github.com/kpn-iot/senml-python-library \
+  && cd senml-python-library \
+  && git checkout 562ab57920a7abe4b2f960a58b403966d065241b \
+  && python3 setup.py bdist_wheel \
+  && cd ..
 
 # build m2crypto
 FROM python:3.9-alpine3.16 AS m2crypto_build
-RUN set -ex \
-    && apk add --no-cache --virtual -build-dep \
-    build-base python3-dev openssl-dev swig
 
-RUN set -ex \
-    && pip3 wheel M2Crypto==0.38.0 --wheel-dir=/
+RUN apk add --no-cache --virtual -build-dep \
+  build-base \
+  python3-dev \
+  openssl-dev \
+  swig
+
+RUN pip3 wheel M2Crypto==0.38.0 --wheel-dir=/
 
 # build portenta-x8-eeprom-utils
 FROM python:3.9-alpine3.16 as eeprom_utils_build
 
 RUN apk add git g++ make cmake
 
-RUN git clone https://github.com/pika-spark/portenta-x8-eeprom-utils && \
-    cd portenta-x8-eeprom-utils && \
-    mkdir build && \
-    cd build && \
-    cmake .. && \
-    cmake --build .
+RUN git clone https://github.com/pika-spark/portenta-x8-eeprom-utils \
+  && cd portenta-x8-eeprom-utils \
+  && mkdir build && \
+  && cd build \
+  && cmake ..\
+  && cmake --build .
 
 # copy data to final container
 FROM python:3.9-alpine3.16
 
 LABEL maintainer="Mattia Pennasilico <m.pennasilico@arduino.cc>"
 
 # install openssl1.1-compat and other required packages
-RUN apk add --no-cache openssl openssh-client openssl-dev dropbear nano git newt pciutils
-
-RUN apk add --no-cache alpine-sdk cmake linux-headers zlib-dev bsd-compat-headers
+RUN apk add --no-cache \
+  alpine-sdk \
+  bsd-compat-headers \
+  cmake \
+  dropbear \
+  git \
+  linux-headers \
+  nano \
+  newt \
+  pciutils \
+  openssl \
+  openssh-client \
+  openssl-dev \
+  zlib-dev
 
 # install libubootenv to the correct version (0.3.2)
-RUN git clone --depth 1 --branch v0.3.2 https://github.com/sbabic/libubootenv.git && \
-    cd libubootenv && \
-    mkdir build && \
-    cd build && \
-    cmake .. && \
-    cmake --build . && \
-    make install && \
-    apk del alpine-sdk cmake linux-headers zlib-dev bsd-compat-headers && \
-    cd ../../ && \
-    rm -rf libubootenv
+RUN git clone --depth 1 --branch v0.3.2 https://github.com/sbabic/libubootenv.git \
+  && cd libubootenv \
+  && mkdir build \
+  && cd build \
+  && cmake ..\
+  && cmake --build . \
+  && make install \
+  && apk del alpine-sdk cmake linux-headers zlib-dev bsd-compat-headers \
+  && cd ../../
+  && rm -rf libubootenv
 
 # copy libtee
 COPY --from=op_tee_build /optee_client/out/libteec/libteec.so* /usr/lib/
@@ -99,9 +124,9 @@ COPY --from=op_tee_build /optee_client/public/*.h /usr/include/
 
 # copy libp11
 COPY --from=p11_build /usr/lib/engines-1.1/pkcs11.so /usr/lib/engines-1.1/pkcs11.so
-RUN set -ex \
-    && cd /usr/lib/engines-1.1 \
-    && ln -s -f pkcs11.so libpkcs11.so
+
+RUN cd /usr/lib/engines-1.1 \
+  && ln -s -f pkcs11.so libpkcs11.so
 
 # copy kpn senml library
 COPY --from=kpn_senml_build /senml-python-library/dist/kpn_senml-1.1.1-py3-none-any.whl /tmp
@@ -121,7 +146,6 @@ RUN pip3 install --find-links=/tmp --no-index M2Crypto
 RUN pip3 install /tmp/kpn_senml-1.1.1-py3-none-any.whl
 
 # install aiotcloud library
-#RUN pip3 install https://github.com/bcmi-labs/python-aiotcloud/releases/download/v0.0.2/arduino_iot_cloud-0.0.2-py3-none-any.whl \
 ADD arduino_iot_cloud-0.0.2-py3-none-any.whl /tmp/
 RUN pip3 install /tmp/arduino_iot_cloud-0.0.2-py3-none-any.whl
 
@@ -140,7 +164,6 @@ RUN mkdir -p /etc/dropbear
 # Copy motd welcome message
 COPY ./motd /etc/motd
 RUN chmod 644 /etc/motd
-
 COPY ./ca-root.pem /etc/ssl/certs/ca-cert-Arduino.pem
 RUN chmod -R 644 /etc/ssl/certs/ca-cert-Arduino.pem
 
@@ -156,4 +179,5 @@ COPY ./portenta_hat_carrier.txt /root/examples/tenta-config
 # Entrypoint
 COPY ./entrypoint.sh /
 RUN chmod 700 /entrypoint.sh
+
 ENTRYPOINT ["/entrypoint.sh"]

arduino-ootb-python-devel/README.md

@@ -0,0 +1,5 @@
+# Arduino out of the box python development
+
+Python development image for arduino out of the box application 
+
+