Skip to content

Commit 48adf4d

Browse files
authored
Fix install latest git on bionic image
1 parent b7ccffa commit 48adf4d

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

bionic-arm64/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ FROM ${REPO}:${TAG}
44

55
ARG DEBIAN_FRONTEND=noninteractive
66

7-
# Latest stable git
8-
RUN add-apt-repository ppa:git-core/ppa -y
9-
107
# ubuntu keeps its i386/amd64 and other architecture repos separate
118
# the default i386/amd64 packages can be found in http://archive.ubuntu.com while all other architectures are in http://ports.ubuntu.com/
129
# add the required repos for armhf/arm64 and only fetch i386/amd64 from archive.ubuntu.com (to prevent apt from erroring about missing architecture support)
@@ -15,6 +12,11 @@ RUN echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ bionic main universe m
1512
RUN echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ bionic-security main universe multiverse restricted" | tee -a /etc/apt/sources.list
1613
RUN echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ bionic-updates main universe multiverse restricted" | tee -a /etc/apt/sources.list
1714
RUN dpkg --add-architecture arm64
15+
16+
# Latest stable git
17+
RUN apt-get update && apt-get install -y software-properties-common
18+
RUN add-apt-repository ppa:git-core/ppa -y
19+
1820
RUN apt-get update && apt-get install -y --no-install-recommends \
1921
gcc-8-aarch64-linux-gnu \
2022
g++-8-aarch64-linux-gnu \

bionic-armhf/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ FROM ${REPO}:${TAG}
44

55
ARG DEBIAN_FRONTEND=noninteractive
66

7-
# Latest stable git
8-
RUN add-apt-repository ppa:git-core/ppa -y
9-
107
# ubuntu keeps its i386/amd64 and other architecture repos separate
118
# the default i386/amd64 packages can be found in http://archive.ubuntu.com while all other architectures are in http://ports.ubuntu.com/
129
# add the required repos for armhf/arm64 and only fetch i386/amd64 from archive.ubuntu.com (to prevent apt from erroring about missing architecture support)
@@ -15,6 +12,11 @@ RUN echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ bionic main universe m
1512
RUN echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ bionic-security main universe multiverse restricted" | tee -a /etc/apt/sources.list
1613
RUN echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ bionic-updates main universe multiverse restricted" | tee -a /etc/apt/sources.list
1714
RUN dpkg --add-architecture armhf
15+
16+
# Latest stable git
17+
RUN apt-get update && apt-get install -y software-properties-common
18+
RUN add-apt-repository ppa:git-core/ppa -y
19+
1820
RUN apt-get update && apt-get install -y --no-install-recommends \
1921
gcc-8-arm-linux-gnueabihf \
2022
g++-8-arm-linux-gnueabihf \

0 commit comments

Comments
 (0)