From 0fb1a8776ec7f53f2b480ea87816693d70f7c3f6 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 30 Apr 2019 11:24:40 +0200 Subject: [PATCH 1/6] gitignore and labels in Dockerfile --- .gitignore | 3 +++ Dockerfile | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a996703 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.*~ +~* +*~ diff --git a/Dockerfile b/Dockerfile index 6d5bade..ccc36c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ FROM registry.gitlab.com/wolutator/base-build-env:latest -MAINTAINER Wolfgang Hottgenroth +LABEL Maintainer="Wolfgang Hottgenroth " +LABEL ImageName="registry.gitlab.com/wolutator/build-env-arduino" ARG ArduinoPackage=arduino-cli-latest-linux64.tar.bz2 ARG ArduinoUID="2252" From 57db78d44c57900de05fa6400434a6c49545a3f0 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 30 Apr 2019 11:36:02 +0200 Subject: [PATCH 2/6] install vim.tiny --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index ccc36c0..6d79da8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,7 @@ ENV USER arduino RUN \ apt update && \ apt install -y wget && \ + apt install -y vim.tiny && \ rm -rf /var/lib/apt/lists/* && \ cd /tmp && \ wget https://downloads.arduino.cc/arduino-cli/${ArduinoPackage} && \ From 4037727566775a1f1ed4b8761e31118a416640ac Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 30 Apr 2019 13:40:42 +0200 Subject: [PATCH 3/6] fix issue in esp8266 env --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6d79da8..e399d88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,8 @@ COPY arduino-cli.yaml /home/$USER/.arduino15/ RUN \ arduino-cli core update-index && \ arduino-cli core install arduino:avr && \ - arduino-cli core install esp8266:esp8266 + 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 CMD ["/bin/bash"] From 865e0c7bb50857ca7813d05a0f739fbce9ce0aa6 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 7 May 2019 17:43:11 +0200 Subject: [PATCH 4/6] add gitlabreleaseuploader --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index e399d88..305cb78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,9 +12,12 @@ RUN \ apt update && \ apt install -y wget && \ apt install -y vim.tiny && \ + apt install -y python-requests && \ rm -rf /var/lib/apt/lists/* && \ cd /tmp && \ wget https://downloads.arduino.cc/arduino-cli/${ArduinoPackage} && \ + wget https://gitlab.com/wolutator/gitlabreleaseuploader/uploads/e105045f7883b8082e810365f685d269/gitlabreleaseuploader.py && \ + mv gitlabreleaseuploader.py /usr/bin/ && \ Filename=`tar -tjf ${ArduinoPackage}` && \ tar -xjf ${ArduinoPackage} && \ mv $Filename /usr/bin/arduino-cli && \ From 3fcac6996c8c4bb344125881cc9c8d3fe8c761ec Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 7 May 2019 15:58:30 +0000 Subject: [PATCH 5/6] drop gitlabreleaseuploader, moved to base build env --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 305cb78..efe44ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,8 +16,6 @@ RUN \ rm -rf /var/lib/apt/lists/* && \ cd /tmp && \ wget https://downloads.arduino.cc/arduino-cli/${ArduinoPackage} && \ - wget https://gitlab.com/wolutator/gitlabreleaseuploader/uploads/e105045f7883b8082e810365f685d269/gitlabreleaseuploader.py && \ - mv gitlabreleaseuploader.py /usr/bin/ && \ Filename=`tar -tjf ${ArduinoPackage}` && \ tar -xjf ${ArduinoPackage} && \ mv $Filename /usr/bin/arduino-cli && \ From e54683cfae52d3ffd548db955bd50071e9323529 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Fri, 17 May 2019 17:33:08 +0200 Subject: [PATCH 6/6] add python-cheetah --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index efe44ac..f55fa85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,9 +10,8 @@ ENV USER arduino RUN \ apt update && \ - apt install -y wget && \ apt install -y vim.tiny && \ - apt install -y python-requests && \ + apt install -y python-cheetah && \ rm -rf /var/lib/apt/lists/* && \ cd /tmp && \ wget https://downloads.arduino.cc/arduino-cli/${ArduinoPackage} && \