liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-1148] add openocd to docker image (#413)

Browse Source 
* Add openocd in docker
* Refactor Dockerfile
This commit is contained in:
rusdacent 2021-04-18 11:18:33 +03:00 committed by GitHub
parent e0bc80cd8b
commit 6204c61cee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
docker/Dockerfile
View File

@ -7,12 +7,17 @@ RUN apt update && \
software-properties-common \ software-properties-common \
gpg-agent \ gpg-agent \
make \ make \
cmake \
autoconf \ autoconf \
automake \ automake \
libtool \ libtool \
libusb-1.0 \
libusb-1.0-0-dev \
libgtk-3-dev pandoc \
curl \ curl \
wget \ wget \
g++ \ g++ \
gcc \
unzip \ unzip \
build-essential \ build-essential \
python \ python \
@ -21,6 +26,8 @@ RUN apt update && \
imagemagick \ imagemagick \
srecord \ srecord \
git \ git \
pkg-config \
dfu-util \
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main" RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main"
@ -36,30 +43,18 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile=minimal --target thum
# st-flash # st-flash
RUN apt update && \ RUN wget https://github.com/stlink-org/stlink/archive/v1.5.1.zip && \
apt install -y --no-install-recommends \
gcc build-essential cmake libusb-1.0 libusb-1.0-0-dev libgtk-3-dev pandoc \
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
wget https://github.com/stlink-org/stlink/archive/v1.5.1.zip && \
unzip v1.5.1.zip && \ unzip v1.5.1.zip && \
cd stlink-1.5.1 && make clean && make release && \ cd stlink-1.5.1 && make clean && make release && \
cd build/Release && make install && ldconfig cd build/Release && make install && ldconfig
# dfu-util
RUN apt update && \
apt install -y --no-install-recommends \
dfu-util \
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# install arm-none-eabi # install arm-none-eabi
RUN wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2 && \ RUN wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2 && \
tar xjf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2 && \ tar xjf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2 && \
cd gcc-arm-none-eabi-10-2020-q4-major/bin/ && \ cd gcc-arm-none-eabi-10-2020-q4-major/bin/ && \
for file in * ; do ln -s ${PWD}/${file} /usr/bin/${file} ; done for file in * ; do ln -s ${PWD}/${file} /usr/bin/${file} ; done && \
cd / && arm-none-eabi-gcc -v && arm-none-eabi-gdb -v
RUN cd / && arm-none-eabi-gcc -v && arm-none-eabi-gdb -v
# install hex2dfu # install hex2dfu
@ -68,6 +63,12 @@ RUN wget https://github.com/rusdacent/hex2dfu/archive/master.zip --output-docume
cd hex2dfu-master && gcc hex2dfu.c ED25519/*.c -o hex2dfu && \ cd hex2dfu-master && gcc hex2dfu.c ED25519/*.c -o hex2dfu && \
ln -s ${PWD}/hex2dfu /usr/bin/hex2dfu ln -s ${PWD}/hex2dfu /usr/bin/hex2dfu
# install openocd
RUN git clone --depth 1 --branch v0.11.0 https://github.com/ntfreak/openocd.git && \
cd openocd && ./bootstrap && ./configure && ls -la && make install && \
openocd --version
COPY entrypoint.sh syntax_check.sh / COPY entrypoint.sh syntax_check.sh /
RUN chmod +x /syntax_check.sh RUN chmod +x /syntax_check.sh