new cube clt and mx version

new docker registry

CubeMx/Dockerfile

@@ -1,31 +1,25 @@
-FROM nexus.springblast.de:8082/carly/docker-stm32/cubeclt:latest
+FROM docker.springblast.de/stm32/cubeclt:latest
 
-ARG INSTALL_CUBEMX="true"
+ARG LICENSE_ALREADY_ACCEPTED=1
 
+USER root
 # Install Xpra, X server, and window manager
 # RUN apt-get update && apt-get install -y xpra xterm
 
-# Optionally install the CubeMX
-COPY ./Resources/CubeMX/cubemx.tar.gz /home/vscode
-RUN tar -xvf /home/vscode/cubemx.tar.gz -C /home/vscode
-RUN rm /home/vscode/cubemx.tar.gz
+RUN apt-get update && apt-get install --no-install-recommends -y chromium
 
-COPY ./Resources/CubeMX/start-cubemx.sh /home/vscode/
-RUN chmod +x /home/vscode/start-cubemx.sh
+RUN mkdir /home/temp
+WORKDIR /home/temp
+RUN wget -q https://nexus.springblast.de/repository/file-repo/Stm32/en.stm32cubemx-lin-v6-14-1.zip
 
-RUN apt-get update && apt-get install -y python3-setuptools
-
-RUN cd /home/vscode && git clone --branch v6.2.5 --single-branch https://github.com/Xpra-org/xpra
-
-RUN cd /home/vscode/xpra && ./setup.py install-repo && apt-get update && apt-get install -y xpra
-
-RUN apt-get clean
+RUN unzip en.stm32cubemx-lin-v6-14-1.zip
+RUN chmod +x SetupSTM32CubeMX-6.14.1
 
 
-# RUN if [ "${INSTALL_CUBEMX}" = "true" ]; then \
-#         chmod +x /tmp/CubeMX/install-cubemx.sh && /tmp/CubeMX/install-cubemx.sh; \
-#     fi
- #  && rm -rf /tmp/CubeMX
+COPY ./Resources/auto-install.xml .
+RUN ./SetupSTM32CubeMX-6.14.1 auto-install.xml
 
- #CMD xpra start --start=xeyes --bind-tcp=0.0.0.0:14500 --html=on --daemon=no && bash
- #sudo xpra start :100 --start=xterm --no-daemon --bind-tcp=0.0.0.0:14500 --html=on
+RUN rm -rf /home/temp
+
+RUN apt-get clean && \
+    rm -rf /var/lib/apt/lists/*

CubeMx/Resources/CubeMX/install-cubemx.sh

@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-# Set the script to fail if any command fails.
-set -e
-
-# Cleanup temporary directory and associated files when exiting the script.
-cleanup() {
-    EXIT_CODE=$?
-    set +e
-    if [[ -n "${TMP_DIR}" ]]; then
-        echo "Executing cleanup of tmp files"
-        rm -Rf "${TMP_DIR}"
-    fi
-    exit $EXIT_CODE
-}
-
-echo "Installing CubeMX..."
-
-# Extract zip file
-unzip -q /tmp/CubeMX/en.stm32cubemx-lin-v6-13-0.zip -d /tmp/CubeMX
-
-

CubeMx/Resources/CubeMX/start-cubemx.sh

@@ -1 +0,0 @@
-xpra start :100 --start=/home/vscode/STM32CubeMX/STM32CubeMX --no-daemon --bind-tcp=0.0.0.0:14500 --html=on

CubeMx/Resources/auto-install.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<AutomatedInstallation langpack="eng">
+    <com.st.microxplorer.install.MXHTMLHelloPanel id="readme"/>
+    <com.st.microxplorer.install.MXLicensePanel id="licence.panel"/>
+    <com.st.microxplorer.install.MXAnalyticsPanel id="analytics.panel"/>
+    <com.st.microxplorer.install.MXTargetPanel id="target.panel">
+        <installpath>/usr/local/STMicroelectronics/STM32Cube/STM32CubeMX</installpath>
+    </com.st.microxplorer.install.MXTargetPanel>
+    <com.st.microxplorer.install.MXShortcutPanel id="shortcut.panel"/>
+    <com.st.microxplorer.install.MXInstallPanel id="install.panel"/>
+    <com.st.microxplorer.install.MXFinishPanel id="finish.panel"/>
+</AutomatedInstallation>

CubeMx/build_and_publish.sh

@@ -13,10 +13,10 @@ while getopts "pt:" opt; do
 done
 
 
-docker build -t nexus.springblast.de:8082/carly/docker-stm32/cubemx:$tag $script_dir/.
-docker build -t nexus.springblast.de:8082/carly/docker-stm32/cubemx:latest $script_dir/.
+docker build -t docker.springblast.de/stm32/cubemx:$tag $script_dir/.
+docker build -t docker.springblast.de/stm32/cubemx:latest $script_dir/.
 
 if [ "$push" = true ]; then
-  docker push nexus.springblast.de:8082/carly/docker-stm32/cubemx:$tag
-  docker push nexus.springblast.de:8082/carly/docker-stm32/cubemx:latest
+  docker push docker.springblast.de/stm32/cubemx:$tag
+  docker push docker.springblast.de/stm32/cubemx:latest
 fi