17 Commits

4 changed files with 21 additions and 18 deletions

View File

@ -2,5 +2,3 @@ include:
- project: dockerized/commons - project: dockerized/commons
ref: master ref: master
file: gitlab-ci-template.yml file: gitlab-ci-template.yml

View File

@ -1,20 +1,21 @@
FROM registry.gitlab.com/wolutator/base-build-env:latest FROM registry.hottis.de/dockerized/base-build-env:1.5.3-bullseye
LABEL Maintainer="Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>" LABEL Maintainer="Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>"
LABEL ImageName="registry.hottis.de/dockerized/build-env-arduino" LABEL ImageName="registry.hottis.de/dockerized/build-env-arduino"
LABEL HubImageName="wollud1969/build-env-arduino" LABEL HubImageName="wollud1969/build-env-arduino"
ARG ArduinoDownloadUrl=https://github.com/arduino/arduino-cli/releases/download/0.5.0 ARG ArduinoDownloadUrl=https://github.com/arduino/arduino-cli/releases/download/0.29.0
ARG ArduinoPackage=arduino-cli_0.5.0_Linux_64bit.tar.gz ARG ArduinoPackage=arduino-cli_0.29.0_Linux_64bit.tar.gz
ARG ArduinoUID="1000" ARG ArduinoUID="1000"
ARG ArduinoGID="1000" ARG ArduinoGID="1000"
ENV USER arduino ARG USER="arduino"
RUN \ RUN \
apt update && \ apt update && \
apt install -y vim.tiny && \ apt upgrade -y && \
apt install -y python-cheetah && \ apt install -y python3-cheetah && \
rm -rf /var/lib/apt/lists/* && \ pip install pyserial && \
cd /tmp && \ cd /tmp && \
wget ${ArduinoDownloadUrl}/${ArduinoPackage} && \ wget ${ArduinoDownloadUrl}/${ArduinoPackage} && \
tar -xzf ${ArduinoPackage} && \ tar -xzf ${ArduinoPackage} && \
@ -23,24 +24,24 @@ RUN \
useradd -m -r -u $ArduinoUID -g $USER -G dialout $USER useradd -m -r -u $ArduinoUID -g $USER -G dialout $USER
USER $USER USER $USER
WORKDIR /home/$USER WORKDIR /home/${USER}
RUN \ RUN \
arduino-cli config init arduino-cli config init
COPY arduino-cli.yaml /home/$USER/.arduino15/ COPY arduino-cli.yaml /home/${USER}/.arduino15/
RUN \ RUN \
pwd && \
ls -l ~/.arduino15 && \
arduino-cli core update-index && \ arduino-cli core update-index && \
arduino-cli core install arduino:avr && \ arduino-cli core install arduino:avr && \
arduino-cli core install arduino:samd && \ arduino-cli core install arduino:samd && \
arduino-cli core install esp8266:esp8266@2.5.0 && \ arduino-cli core install esp8266:esp8266 && \
sed -i 's/#if DEBUG/#ifdef DEBUG/' ~/.arduino15/packages/esp8266/hardware/esp8266/2.5.0/tools/sdk/libc/xtensa-lx106-elf/include/sys/reent.h arduino-cli core install esp32:esp32 && \
arduino-cli core install Heltec-esp32:esp32 && \
arduino-cli core install CubeCell:CubeCell
CMD ["/bin/bash"] CMD ["/bin/bash"]

View File

@ -1 +0,0 @@
0.7-0.5.0

View File

@ -4,3 +4,8 @@ arduino_data: /home/arduino/.arduino15
board_manager: board_manager:
additional_urls: additional_urls:
- http://arduino.esp8266.com/stable/package_esp8266com_index.json - http://arduino.esp8266.com/stable/package_esp8266com_index.json
- https://dl.espressif.com/dl/package_esp32_index.json
- https://github.com/Heltec-Aaron-Lee/WiFi_Kit_series/releases/download/0.0.7/package_heltec_esp32_index.json
- http://resource.heltec.cn/download/package_CubeCell_index.json