Merge branch 'feat/bookworm_32_64' into feat/bullseye_64_20240304

CoderBotOrg · Apr 6, 2024 · 02b15af · 02b15af
2 parents cd40200 + d3f04c7
commit 02b15af
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 31 deletions.
diff --git a/.github/workflows/build_backend.yml b/.github/workflows/build_backend.yml
@@ -27,7 +27,7 @@ jobs:
         mkdir -p schemathesis
         python3 -m venv schemathesis
         . schemathesis/bin/activate
-        pip install schemathesis==3.24.3
+        pip install schemathesis==3.24.3 
         st run --endpoint 'activities' --hypothesis-max-examples=10 --request-timeout=20 http://localhost:5000/api/v1/openapi.json
         #st run --endpoint 'media' --hypothesis-max-examples=10 --request-timeout=20 http://localhost:5000/api/v1/openapi.json
         st run --endpoint 'control/speak' --hypothesis-max-examples=10 --request-timeout=20 http://localhost:5000/api/v1/openapi.json

diff --git a/coderbot/v1.yml b/coderbot/v1.yml
@@ -170,9 +170,10 @@ paths:
           required: true
           schema:
             type: string
-            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
             minLength: 1
             maxLength: 128
+            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
+
       tags:
         - Program management
       responses:
@@ -187,9 +188,9 @@ paths:
           required: true
           schema:
             type: string
-            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
             minLength: 1
             maxLength: 128
+            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
       responses:
         200:
           description: "ok"
@@ -206,9 +207,9 @@ paths:
           required: true
           schema:
             type: string
-            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
             minLength: 1
             maxLength: 128
+            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
       requestBody:
         description: Program object
         required: true
@@ -234,9 +235,9 @@ paths:
           required: true
           schema:
             type: string
-            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
             minLength: 1
             maxLength: 128
+            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
       requestBody:
         description: Program object
         required: true
@@ -260,9 +261,9 @@ paths:
           required: true
           schema:
             type: string
-            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
             minLength: 1
             maxLength: 128
+            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
       responses:
         200:
           description: "ok"
@@ -279,9 +280,9 @@ paths:
           required: true
           schema:
             type: string
-            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
             minLength: 1
             maxLength: 128
+            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
       responses:
         200:
           description: "ok"
@@ -322,9 +323,9 @@ paths:
           required: true
           schema:
             type: string
-            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
             minLength: 1
             maxLength: 128
+            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
         - name: default
           in: query
           schema:
@@ -344,9 +345,9 @@ paths:
           required: true
           schema:
             type: string
-            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
             minLength: 1
             maxLength: 128
+            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
       requestBody:
         description: Update Activity
         required: true
@@ -370,9 +371,9 @@ paths:
           required: true
           schema:
             type: string
-            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
             minLength: 1
             maxLength: 128
+            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
       responses:
         200:
           description: "ok"
@@ -413,9 +414,9 @@ paths:
           required: true
           schema:
             type: string
-            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
             minLength: 1
             maxLength: 128
+            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
       tags:
         - Music extensions
       responses:
@@ -617,9 +618,9 @@ paths:
           required: true
           schema:
             type: string
-            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
             minLength: 1
             maxLength: 128
+            pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
       tags:
         - CNN Models
       responses:
@@ -634,6 +635,8 @@ paths:
           required: true
           schema:
             type: string
+            minLength: 1
+            maxLength: 128
             pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
       tags:
         - CNN Models
@@ -722,9 +725,9 @@ components:
       properties:
         name:
           type: string
-          pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
           minLength: 1
           maxLength: 128
+          pattern: '^[a-zA-ZA-zÀ-ú0-9-_ ]+$'
         code:
           type: string
           minLength: 1

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM coderbot/raspberrypi3:bullseye-20240227
+FROM balenalib/raspberrypi3:bookworm-20240227
 
 ENV QEMU_CPU=max
 ENV DEBIAN_FRONTEND=noninteractive
@@ -9,7 +9,7 @@ RUN echo "deb http://archive.raspberrypi.org/debian/ bullseye main" > /etc/apt/s
   && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 82B129927FA3303E
 
 RUN install_packages \
- libraspberrypi0 \
+ build-essential \
  procps \
  sudo \
  wget \
@@ -21,19 +21,19 @@ RUN install_packages \
  python3-pip \
  python3-dev \
  libopenjp2-7-dev \
- libtiff5 \
+ libtiff5-dev \
  libatlas-base-dev \
  libhdf5-dev \
  alsa-utils \
  espeak \
  python3-picamera2
 RUN install_packages \
  libharfbuzz-bin \
- libwebp6 \
- libilmbase25 \
+ webp \
+ libilmbase-dev \
  libgstreamer1.0-0 \
- libavcodec-extra58 \
- libavformat58
+ libavcodec-extra59 \
+ libavformat59
 RUN install_packages \
  libopencv-dev \
  zbar-tools \
@@ -52,8 +52,8 @@ RUN install_packages \
 
 ENV READTHEDOCS=True
 ADD requirements.txt /tmp/.
-RUN pip install --upgrade pip && \
-  pip install --no-cache-dir -r /tmp/requirements.txt
+RUN pip install --break-system-packages --upgrade pip && \
+  pip install --no-cache-dir --break-system-packages -r /tmp/requirements.txt
 
 RUN mkdir -p /coderbot && \
 mkdir -p /coderbot/data && \

diff --git a/docker/Dockerfile.arm64 b/docker/Dockerfile.arm64
@@ -1,4 +1,4 @@
-FROM coderbot/raspberrypi3-64:bullseye-20240304
+FROM balenalib/raspberrypi3-64:bookworm-20240401
 
 ENV QEMU_CPU=max
 ENV DEBIAN_FRONTEND=noninteractive
@@ -10,7 +10,6 @@ RUN echo "deb http://archive.raspberrypi.org/debian/ bullseye main" > /etc/apt/s
 
 RUN install_packages \
  build-essential \
- libraspberrypi0 \
  procps \
  sudo \
  wget \
@@ -22,19 +21,19 @@ RUN install_packages \
  python3-pip \
  python3-dev \
  libopenjp2-7-dev \
- libtiff5 \
+ libtiff5-dev \
  libatlas-base-dev \
  libhdf5-dev \
  alsa-utils \
  espeak \
  python3-picamera2
 RUN install_packages \
  libharfbuzz-bin \
- libwebp6 \
- libilmbase25 \
+ webp \
+ libilmbase-dev \
  libgstreamer1.0-0 \
- libavcodec-extra58 \
- libavformat58
+ libavcodec-extra59 \
+ libavformat59
 RUN install_packages \
  libopencv-dev \
  zbar-tools \
@@ -53,8 +52,8 @@ RUN install_packages \
 
 ENV READTHEDOCS=True
 ADD requirements.txt /tmp/.
-RUN pip install --upgrade pip && \
-  pip install --no-cache-dir -r /tmp/requirements.txt
+RUN pip install --break-system-packages --upgrade pip && \
+  pip install --no-cache-dir --break-system-packages -r /tmp/requirements.txt
 
 RUN mkdir -p /coderbot && \
 mkdir -p /coderbot/data && \