Skip to content

Fixing arm64 build #187

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 6, 2022
Merged

Fixing arm64 build #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ FROM base as build
LABEL maintainer="Denys Zhdanov <denis.zhdanov@gmail.com>"

ARG python_binary=python3
ARG python_extra_flags="--single-version-externally-managed --root=/"
ENV PYTHONDONTWRITEBYTECODE=1

RUN true \
Expand Down Expand Up @@ -89,7 +90,7 @@ ARG whisper_repo=https://github.com/graphite-project/whisper.git
RUN git clone -b ${whisper_version} --depth 1 ${whisper_repo} /usr/local/src/whisper \
&& cd /usr/local/src/whisper \
&& . /opt/graphite/bin/activate \
&& $python_binary ./setup.py install --single-version-externally-managed --root=/
&& $python_binary ./setup.py install $python_extra_flags

# install carbon
ARG carbon_version=${version}
Expand All @@ -98,7 +99,7 @@ RUN . /opt/graphite/bin/activate \
&& git clone -b ${carbon_version} --depth 1 ${carbon_repo} /usr/local/src/carbon \
&& cd /usr/local/src/carbon \
&& pip3 install -r requirements.txt \
&& $python_binary ./setup.py install --single-version-externally-managed --root=/
&& $python_binary ./setup.py install $python_extra_flags

# install graphite
ARG graphite_version=${version}
Expand All @@ -107,7 +108,7 @@ RUN . /opt/graphite/bin/activate \
&& git clone -b ${graphite_version} --depth 1 ${graphite_repo} /usr/local/src/graphite-web \
&& cd /usr/local/src/graphite-web \
&& pip3 install -r requirements.txt \
&& $python_binary ./setup.py install --single-version-externally-managed --root=/
&& $python_binary ./setup.py install $python_extra_flags

# install statsd
ARG statsd_version=0.9.0
Expand Down
6 changes: 4 additions & 2 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env bash
VERSION=1.1.8-3
docker build . --build-arg python_binary=python3 --no-cache --tag graphiteapp/graphite-statsd:$VERSION
VERSION=1.1.8-4
docker build . \
--build-arg python_binary=python3 --build-arg python_extra_flags="--single-version-externally-managed --root=/" \
--no-cache --tag graphiteapp/graphite-statsd:$VERSION
4 changes: 2 additions & 2 deletions build_pypy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
VERSION=1.1.8-3
VERSION=1.1.8-4
IMAGE=jamiehewland/alpine-pypy:3.6-7.3-alpine3.11
docker build . \
--build-arg BASEIMAGE=${IMAGE} --build-arg python_binary=/usr/local/bin/pypy3 \
--build-arg BASEIMAGE=${IMAGE} --build-arg python_binary=/usr/local/bin/pypy3 --build-arg python_extra_flags="" \
--no-cache --tag graphiteapp/graphite-statsd:$VERSION-pypy