From 300cadf627e51542a8063393c5d98127090a6e15 Mon Sep 17 00:00:00 2001 From: jedi Date: Fri, 25 Jun 2021 22:50:25 +0200 Subject: [PATCH] add Dockerfile for build environment --- Makefile | 2 +- docker/Dockerfile | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2257790..210ca98 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ clean: firmware_docker: sh -c "docker build -t fiatlux_env docker" - sh -c "docker run --volume "$$(pwd)"/firmware:/app/firmware fiatlux_env make -C firmware all" + sh -c "docker run --volume "$$(pwd)"/firmware:/app/firmware fiatlux_env make -C firmware html all" clean_docker: sh -c "docker build -t fiatlux_env docker" diff --git a/docker/Dockerfile b/docker/Dockerfile index 582fe2f..ab1be17 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,6 @@ # syntax=docker/dockerfile:1 FROM debian:sid +<<<<<<< HEAD RUN apt update && apt install -y make bash gawk g++ gcc libc6-dev flex bison automake autoconf gperf texinfo wget git bzip2 help2man libtool libtool-bin unrar-free unzip ncurses-dev libexpat-dev python-dev python3; mkdir /app; chown 1000:1000 /app; cd /app; useradd user; USER 1000 RUN cd app; git clone --recursive https://github.com/SuperHouse/esp-open-rtos.git modules/rtos; git clone --recursive https://github.com/pfalcon/esp-open-sdk.git modules/sdk @@ -10,4 +11,12 @@ RUN apt remove --purge -y python2 && apt autoremove --purge -y && apt install -y RUN apt install -y --reinstall python-is-python3 USER 1000 WORKDIR /app -ENV PATH=/app/modules/sdk/xtensa-lx106-elf/bin:$PATH \ No newline at end of file +ENV PATH=/app/modules/sdk/xtensa-lx106-elf/bin:$PATH +======= +RUN apt update && apt install -y make bash gawk g++ gcc libc6-dev flex bison automake autoconf gperf texinfo wget git bzip2 help2man libtool libtool-bin unrar-free unzip ncurses-dev libexpat-dev python-dev python3 +RUN mkdir modules; git clone --recursive https://github.com/SuperHouse/esp-open-rtos.git modules/rtos; git clone --recursive https://github.com/pfalcon/esp-open-sdk.git modules/sdk +RUN sed -i 's/GNU bash, version (3\\\.\[1-9\]|4)/GNU bash, version (3.[1-9]|4|5)/g' modules/sdk/crosstool-NG/configure.ac; mkdir -p modules/sdk/crosstool-NG/.build/tarballs; wget https://github.com/libexpat/libexpat/releases/download/R_2_1_0/expat-2.1.0.tar.gz -O modules/sdk/crosstool-NG/.build/tarballs/expat-2.1.0.tar.gz +RUN cd modules/sdk; export CT_EXPERIMENTAL=y; export CT_ALLOW_BUILD_AS_ROOT=y; export CT_ALLOW_BUILD_AS_ROOT_SURE=y; make standalone=y -j$(nproc); wget -N https://raw.githubusercontent.com/espressif/esptool/master/esptool.py -O xtensa-lx106-elf/bin/esptool.py +RUN apt remove --purge -y python2 && apt install -y make python3 python3-serial python-is-python3 perl +ENV PATH=/modules/sdk/xtensa-lx106-elf/bin:$PATH +>>>>>>> 94c54ac (add Dockerfile for build environment)