Skip to content

Commit

Permalink
docker: fix build on arm64 architecture
Browse files Browse the repository at this point in the history
  • Loading branch information
tiborsimko committed Oct 29, 2023
1 parent 1712018 commit df5f377
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Changes
=======

Version 0.9.2 (UNRELEASED)
--------------------------

- Fixes container image building on the arm64 architecture.

Version 0.9.1 (2023-09-27)
--------------------------

Expand Down
17 changes: 16 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
# Use Ubuntu LTS base image
FROM docker.io/library/ubuntu:20.04

# Recognise target architecture
ARG TARGETARCH

# Use default answers in installation commands
ENV DEBIAN_FRONTEND=noninteractive

Expand Down Expand Up @@ -82,7 +85,19 @@ COPY . /code

# Are we debugging?
ARG DEBUG=0
RUN if [ "${DEBUG}" -gt 0 ]; then pip install -e ".[debug]"; else pip install .; fi;
RUN if [ "${DEBUG}" -gt 0 ]; then \
if echo "$COMPUTE_BACKENDS" | grep -q "htcondorcern"; then \
pip install -e ".[debug,htcondor]"; \
else \
pip install -e ".[debug]"; \
fi \
else \
if echo "$COMPUTE_BACKENDS" | grep -q "htcondorcern"; then \
pip install ".[htcondor]"; \
else \
pip install .; \
fi \
fi

# Are we building with locally-checked-out shared modules?
# hadolint ignore=SC2102
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ flask==2.1.3 # via reana-job-controller (setup.py)
fs==2.4.16 # via reana-commons, reana-job-controller (setup.py)
google-auth==2.23.0 # via kubernetes
gssapi==1.8.3 # via paramiko
htcondor==9.0.17 # via reana-job-controller (setup.py)
idna==3.4 # via jsonschema, requests
importlib-metadata==6.8.0 # via alembic, flask
importlib-resources==6.1.0 # via alembic
Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
"sphinxcontrib-openapi>=0.8.0",
"sphinxcontrib-redoc>=1.5.1",
],
"htcondor": [
"htcondor==9.0.17",
],
"tests": tests_require,
"ssh": ["paramiko[gssapi]>=3.0.0"],
}
Expand Down Expand Up @@ -63,7 +66,6 @@
"marshmallow>2.13.0,<=2.20.1",
"reana-commons[kubernetes]>=0.9.3,<0.10.0",
"reana-db>=0.9.2,<0.10.0",
"htcondor==9.0.17",
"retrying>=1.3.3",
]

Expand Down

0 comments on commit df5f377

Please sign in to comment.