Skip to content

Commit

Permalink
Merge pull request #593 from INCATools/issue-589-multiarch
Browse files Browse the repository at this point in the history
Build rdftab from source.
  • Loading branch information
gouttegd authored May 4, 2022
2 parents ad08a2e + 7b8551a commit 8cc1c2f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
5 changes: 0 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,3 @@ RUN wget -nv https://github.com/balhoff/relation-graph/releases/download/v$RG/re
&& tar -zxvf relation-graph-$RG.tgz \
&& mv relation-graph-$RG /tools/relation-graph \
&& chmod +x /tools/relation-graph

# rdftab
ENV RDFTAB=0.1.1
RUN wget -nv https://github.com/ontodev/rdftab.rs/releases/download/v$(RSDTAB)/rdftab-x86_64-unknown-linux-musl -O /tools/rdftab \
&& chmod +x /tools/rdftab
13 changes: 13 additions & 0 deletions docker/builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
FROM ubuntu:20.04
WORKDIR /build

# Software versions
ENV RDFTAB_VERSION=0.1.1

# Everything that we want to get into one of the final ODK images
# should be installed into one of these directories.
RUN mkdir -p /staging/lite /staging/full
Expand Down Expand Up @@ -118,6 +121,16 @@ RUN wget -nv https://github.com/fastobo/fastobo-validator/archive/refs/tags/v0.4
cd /build && \
rm -rf fastobo-validator-0.4.0 fastobo-validator-0.4.0.tar.gz /root/.cargo

# Compile rdftab.
RUN wget -nv https://github.com/ontodev/rdftab.rs/archive/refs/tags/v$RDFTAB_VERSION.tar.gz \
-O /build/rdftab.tar.gz && \
tar xf rdftab.tar.gz && \
cd rdftab.rs-$RDFTAB_VERSION && \
cargo build --release && \
install -D -m 755 target/release/rdftab /staging/full/usr/bin/rdftab && \
cd /build && \
rm -rf rdftab.rs-$RDFTAB_VERSION rdftab.tar.gz /root/.cargo

# Compile Konclude if we are not on x86_64
# (building Konclude is time-consuming, so we avoid it
# on x86_64 where a pre-compiled binary is available).
Expand Down

0 comments on commit 8cc1c2f

Please sign in to comment.