fix Dockerfile

2022-12-15 13:23:17 +01:00 · 2022-12-15 13:14:49 +01:00 · 2022-12-15 13:13:34 +01:00 · 2022-12-15 12:57:36 +01:00 · 2022-12-05 18:41:49 +01:00 · 2022-12-04 22:54:29 +01:00
3 changed files with 17 additions and 16 deletions
--- a/29
+++ b/29
@ -1,20 +1,21 @@
-FROM registry.hottis.de/dockerized/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 ImageName="registry.hottis.de/dockerized/build-env-arduino"
 LABEL HubImageName="wollud1969/build-env-arduino"

-ARG ArduinoDownloadUrl=https://github.com/arduino/arduino-cli/releases/download/0.5.0
-ARG ArduinoPackage=arduino-cli_0.5.0_Linux_64bit.tar.gz
+ARG ArduinoDownloadUrl=https://github.com/arduino/arduino-cli/releases/download/0.29.0
+ARG ArduinoPackage=arduino-cli_0.29.0_Linux_64bit.tar.gz
 ARG ArduinoUID="1000"
 ARG ArduinoGID="1000"
-ENV USER arduino
+ARG USER="arduino"

 RUN \
  apt update && \
-  apt install -y vim.tiny && \
-  apt install -y python-cheetah && \
-  rm -rf /var/lib/apt/lists/* && \
+  apt upgrade -y && \
+  apt install -y python3-cheetah && \
+  pip install pyserial && \
  cd /tmp && \
  wget ${ArduinoDownloadUrl}/${ArduinoPackage} && \
  tar -xzf ${ArduinoPackage} && \
@ -23,24 +24,22 @@ RUN \
  useradd -m -r -u $ArduinoUID -g $USER -G dialout $USER

 USER $USER
-WORKDIR /home/$USER
+WORKDIR ~

 RUN \
  arduino-cli config init 

-COPY arduino-cli.yaml /home/$USER/.arduino15/
+COPY arduino-cli.yaml ~/.arduino15/

 RUN \
+  ls -l ~/.arduino15 && \
  arduino-cli core update-index && \
  arduino-cli core install arduino:avr && \
  arduino-cli core install arduino:samd && \
-  arduino-cli core install esp8266:esp8266@2.5.0 && \
-  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 esp8266:esp8266 && \
+  arduino-cli core install esp32:esp32 && \
+  arduino-cli core install Heltec-esp32:esp32
  

 CMD ["/bin/bash"]

-
-  
-  
-
--- a/1
+++ b/1
@ -1 +0,0 @@
-0.7-0.5.0
--- a/arduino-cli.yaml
+++ b/arduino-cli.yaml
@ -4,3 +4,6 @@ arduino_data: /home/arduino/.arduino15
 board_manager:
  additional_urls:
  - 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
+
Author	SHA1	Message	Date
Wolfgang Hottgenroth	27b006899d	fix Dockerfile	2022-12-15 13:23:17 +01:00
Wolfgang Hottgenroth	e0a596ab28	fix Dockerfile	2022-12-15 13:14:49 +01:00
Wolfgang Hottgenroth	4038d23092	fix Dockerfile	2022-12-15 13:13:34 +01:00
Wolfgang Hottgenroth	c21783742c	Update Dockerfile, arg instead of env	2022-12-15 12:57:36 +01:00
Wolfgang Hottgenroth	a147ea3432	one empty line	2022-12-05 18:41:49 +01:00
Wolfgang Hottgenroth	fe1550c1d3	fix ci	2022-12-04 22:54:29 +01:00
Wolfgang Hottgenroth	c9da4dc1f8	add Heltec	2022-12-04 22:50:45 +01:00
Wolfgang Hottgenroth	adb2756f4d	arduino-cli 0.29.0	2022-12-03 00:14:30 +01:00
Wolfgang Hottgenroth	1884294a9e	add python	2021-03-06 18:58:54 +01:00
Wolfgang Hottgenroth	e442d4366f	add esp32	2021-03-06 17:18:45 +01:00
Wolfgang Hottgenroth	c815713a64	new upstream release	2021-02-18 13:54:35 +01:00