Skip to content

Commit

Permalink
Use latest debian and add use pyenv to install python 2.7 for the bre…
Browse files Browse the repository at this point in the history
…akpad build (#24)
  • Loading branch information
Eeems authored Jul 26, 2023
1 parent a685a93 commit 5f22d0d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
12 changes: 12 additions & 0 deletions base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,15 @@ RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update -y \
&& apt-get install -y --no-install-recommends \
git \
zlib1g-dev \
libssl-dev \
# breakpad's build tools require python2 to be available as python on the path
&& git clone https://github.com/pyenv/pyenv.git .pyenv \
&& export PYENV_ROOT="$(pwd)/.pyenv" \
&& export PATH="$PYENV_ROOT/bin:$PATH" \
&& eval "$(pyenv init --path)" \
&& pyenv install 2.7 \
&& pyenv global 2.7 \
# Fetch and activate depot_tools
&& cd /root \
&& git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git \
Expand All @@ -233,7 +242,10 @@ RUN export DEBIAN_FRONTEND=noninteractive \
/tmp/* \
breakpad \
depot_tools \
.pyenv \
&& apt-get autoremove -y \
git \
zlib1g-dev \
libssl-dev \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt
2 changes: 1 addition & 1 deletion toolchain/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Essential cross-compiling build tools for the reMarkable
FROM debian:unstable-20220125-slim
FROM debian:unstable-20230703-slim
ARG NGCONFIG="arm-remarkable-linux-gnueabihf"
ARG CHOST="arm-linux-gnueabihf"

Expand Down

0 comments on commit 5f22d0d

Please sign in to comment.