Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable ARM64 build environment #467

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ FROM ubuntu:20.04 AS container-tools
ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get install -y wget git make \
libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config
libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config \
file

# Detect host architecture
RUN file /bin/bash | grep -q x86-64 && echo amd64 > /tmp/arch || true
RUN file /bin/bash | grep -q aarch64 && echo arm64 > /tmp/arch || true

RUN wget -P /tmp https://go.dev/dl/go1.18.linux-amd64.tar.gz && \
tar -C /usr/local -xzf /tmp/go1.18.linux-amd64.tar.gz
Expand All @@ -17,7 +22,12 @@ RUN git clone https://github.com/containers/skopeo.git /skopeo && \
# Build ostreeuploader, aka fiopush/fiocheck
FROM ubuntu:20.04 AS fiotools
RUN apt-get update
RUN apt-get install -y wget git gcc make -y
RUN apt-get install -y wget git gcc make file

# Detect host architecture
RUN file /bin/bash | grep -q x86-64 && echo amd64 > /tmp/arch || true
RUN file /bin/bash | grep -q aarch64 && echo arm64 > /tmp/arch || true

RUN wget -P /tmp https://go.dev/dl/go1.19.9.linux-amd64.tar.gz && \
tar -C /usr/local -xzf /tmp/go1.19.9.linux-amd64.tar.gz
ENV PATH /usr/local/go/bin:$PATH
Expand Down Expand Up @@ -55,7 +65,7 @@ RUN apt-get update \
openjdk-11-jre openssh-client perl-modules python3 python3-requests \
make patch repo sudo texinfo vim-tiny wget whiptail libelf-dev git-lfs screen \
socket corkscrew curl xz-utils tcl libtinfo5 device-tree-compiler python3-pip python3-dev \
tmux libncurses-dev vim zstd lz4 liblz4-tool libc6-dev-i386 \
tmux libncurses-dev vim zstd lz4 liblz4-tool libc6-dev \
awscli docker-compose gosu xvfb python3-cairo python3-gi-cairo yaru-theme-icon tree rsync \
&& ln -s /usr/bin/python3 /usr/bin/python \
&& pip3 --no-cache-dir install expandvars jsonFormatter \
Expand Down