new cube clt and mx version
new docker registry
This commit is contained in:
@@ -2,7 +2,9 @@ FROM mcr.microsoft.com/devcontainers/cpp:1-debian-12
|
||||
|
||||
ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="3.22.2"
|
||||
|
||||
ARG INSTALL_CUBE_CLT="true"
|
||||
ARG LICENSE_ALREADY_ACCEPTED=1
|
||||
|
||||
RUN apt-get update && apt-get upgrade -y
|
||||
|
||||
# Optionally install the cmake for vcpkg
|
||||
COPY ./Resources/Scripts/reinstall-cmake.sh /tmp/
|
||||
@@ -14,18 +16,25 @@ RUN if [ "${REINSTALL_CMAKE_VERSION_FROM_SOURCE}" != "none" ]; then \
|
||||
|
||||
|
||||
# Optionally install the Cube CLT
|
||||
COPY ../Resources/CubeCLT /tmp/CubeCLT/
|
||||
RUN if [ "${INSTALL_CUBE_CLT}" = "true" ]; then \
|
||||
chmod +x /tmp/CubeCLT/install.sh && /tmp/CubeCLT/install.sh; \
|
||||
fi \
|
||||
&& rm -rf /tmp/CubeCLT
|
||||
RUN apt-get install --no-install-recommends -y unzip
|
||||
RUN mkdir /home/temp
|
||||
WORKDIR /home/temp
|
||||
|
||||
RUN apt-get clean
|
||||
RUN wget http://192.168.1.225:8081/repository/file/Stm32/en.st-stm32cubeclt_1.18.0_24403_20250225_1636_amd64.deb_bundle.sh.zip
|
||||
RUN unzip en.st-stm32cubeclt_1.18.0_24403_20250225_1636_amd64.deb_bundle.sh.zip
|
||||
RUN chmod +x st-stm32cubeclt_1.18.0_24403_20250225_1636_amd64.deb_bundle.sh && ./st-stm32cubeclt_1.18.0_24403_20250225_1636_amd64.deb_bundle.sh
|
||||
WORKDIR /
|
||||
RUN rm -rf /home/temp
|
||||
|
||||
# [Optional] Uncomment this section to install additional vcpkg ports.
|
||||
# RUN su vscode -c "${VCPKG_ROOT}/vcpkg install <your-port-name-here>"
|
||||
WORKDIR /home/vscode
|
||||
RUN apt-get install --no-install-recommends -y python3-pip python3-venv
|
||||
RUN python3 -m venv venv && ./venv/bin/pip install --no-cache-dir pyserial protobuf grpcio grpcio-tools
|
||||
|
||||
|
||||
RUN usermod -aG sudo,dialout,plugdev vscode
|
||||
RUN apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
USER vscode
|
||||
|
||||
# [Optional] Uncomment this section to install additional packages.
|
||||
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
|
||||
# && apt-get -y install --no-install-recommends <your-package-list-here>
|
||||
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Set the script to fail if any command fails.
|
||||
set -e
|
||||
|
||||
echo "Installing CubeCLT..."
|
||||
|
||||
# Extract zip file
|
||||
unzip -q /tmp/CubeCLT/en.st-stm32cubeclt_1.17* -d /tmp/cubeclt
|
||||
cd /tmp/cubeclt && chmod +x *.sh
|
||||
export LICENSE_ALREADY_ACCEPTED=1
|
||||
/tmp/cubeclt/*.sh --target . --noexec
|
||||
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
apt-get update
|
||||
apt-get install -y /tmp/cubeclt/st-stlink-udev-rules*.deb
|
||||
apt-get install -y /tmp/cubeclt/st-stlink-server*.deb
|
||||
apt-get install -y /tmp/cubeclt/st-stm32cubeclt*.deb
|
||||
|
||||
rm -rf /tmp/cubeclt
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -14,10 +14,10 @@ done
|
||||
|
||||
|
||||
|
||||
docker build -t nexus.springblast.de:8082/carly/docker-stm32/cubeclt:$tag $script_dir/.
|
||||
docker build -t nexus.springblast.de:8082/carly/docker-stm32/cubeclt:latest $script_dir/.
|
||||
docker build -t docker.springblast.de/stm32/cubeclt:$tag $script_dir/.
|
||||
docker build -t docker.springblast.de/stm32/cubeclt:latest $script_dir/.
|
||||
|
||||
if [ "$push" = true ]; then
|
||||
docker push nexus.springblast.de:8082/carly/docker-stm32/cubeclt:$tag
|
||||
docker push nexus.springblast.de:8082/carly/docker-stm32/cubeclt:latest
|
||||
docker push docker.springblast.de/stm32/cubeclt:$tag
|
||||
docker push docker.springblast.de/stm32/cubeclt:latest
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user