Skip to content

Commit 802c802

Browse files
committed
[TIDY] refactor tools installation
1 parent ba209b0 commit 802c802

File tree

4 files changed

+36
-24
lines changed

4 files changed

+36
-24
lines changed

linux-aarch64-debian11/Dockerfile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
FROM debian:11-slim
22

3-
RUN apt update
3+
ARG workdir=/work
44

5-
# install basic build tools
6-
RUN apt -y install make git ccache rsync python3
5+
# install basic utilities
6+
RUN apt update && apt -y install git rsync python3
7+
8+
# git might complain about ownership, so ignore it
9+
RUN git config --global --add safe.directory $workdir
710

811
# install aarch64 cross-compiler
912
RUN apt -y install g++-aarch64-linux-gnu
1013

11-
# git might complain about ownership, so ignore it
12-
RUN git config --global --add safe.directory /work
14+
# install basic build tools
15+
RUN apt -y install make ccache
1316

14-
WORKDIR /work
17+
WORKDIR $workdir

linux-armhf-debian10/Dockerfile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
FROM debian:10-slim
22

3-
RUN apt update
3+
ARG workdir=/work
44

5-
# install basic build tools
6-
RUN apt -y install make git ccache rsync python3
5+
# install basic utilities
6+
RUN apt update && apt -y install git rsync python3
7+
8+
# git might complain about ownership, so ignore it
9+
RUN git config --global --add safe.directory $workdir
710

811
# install armhf cross-compiler
912
RUN apt -y install g++-arm-linux-gnueabihf
1013

11-
# git might complain about ownership, so ignore it
12-
RUN git config --global --add safe.directory /work
14+
# install basic build tools
15+
RUN apt -y install make ccache
1316

14-
WORKDIR /work
17+
WORKDIR $workdir

linux-armhf-debian11/Dockerfile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
FROM debian:11-slim
22

3-
RUN apt update
3+
ARG workdir=/work
44

5-
# install basic build tools
6-
RUN apt -y install make git ccache rsync python3
5+
# install basic utilities
6+
RUN apt update && apt -y install git rsync python3
7+
8+
# git might complain about ownership, so ignore it
9+
RUN git config --global --add safe.directory $workdir
710

811
# install armhf cross-compiler
912
RUN apt -y install g++-arm-linux-gnueabihf
1013

11-
# git might complain about ownership, so ignore it
12-
RUN git config --global --add safe.directory /work
14+
# install basic build tools
15+
RUN apt -y install make ccache
1316

14-
WORKDIR /work
17+
WORKDIR $workdir

linux-armhf-ubuntu18/Dockerfile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
FROM ubuntu:18.04
22

3-
RUN apt update
3+
ARG workdir=/work
44

5-
# install basic build tools
6-
RUN apt -y install make git ccache rsync python3
5+
# install basic utilities
6+
RUN apt update && apt -y install git rsync python3
7+
8+
# git might complain about ownership, so ignore it
9+
RUN git config --global --add safe.directory $workdir
710

811
# install armhf cross-compiler
912
RUN apt -y install g++-arm-linux-gnueabihf
1013

11-
# git might complain about ownership, so ignore it
12-
RUN git config --global --add safe.directory /work
14+
# install basic build tools
15+
RUN apt -y install make ccache
1316

14-
WORKDIR /work
17+
WORKDIR $workdir

0 commit comments

Comments
 (0)