From cefa4a9634ce132d5540ed120ecc9941286333a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Dierick?= Date: Thu, 27 Jul 2023 15:33:01 +0200 Subject: [PATCH 1/2] build with libraries required for geosparql support --- Dockerfile | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fd7f9c5..dd601c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,31 @@ ARG VIRTUOSO_COMMIT=f3d88f16bca4274265160e098be3ba3c7d68341c RUN apt-get update RUN apt-get install -y build-essential autotools-dev autoconf automake net-tools libtool \ - flex bison gperf gawk m4 libssl-dev libreadline-dev openssl wget + flex bison gperf gawk m4 libssl-dev libreadline-dev openssl wget bzip2 + +# Build libraries for GeoSPARQL support according to https://github.com/openlink/virtuoso-opensource/blob/10b2678ca4a801e75bc654a656017c3cfc0d8760/README.GeoSPARQL.md +# proj4 +RUN wget https://download.osgeo.org/proj/proj-4.9.3.tar.gz +RUN tar xzf proj-4.9.3.tar.gz +WORKDIR proj-4.9.3 +RUN ./configure +RUN make +RUN make install + +# geos +WORKDIR ../ +RUN wget http://download.osgeo.org/geos/geos-3.5.1.tar.bz2 +RUN bzip2 -d geos-3.5.1.tar.bz2 +RUN ls -a +RUN tar xf geos-3.5.1.tar +WORKDIR geos-3.5.1 +RUN ./configure +RUN make +RUN make check +RUN make install +RUN ldconfig + +WORKDIR ../ RUN wget https://github.com/openlink/virtuoso-opensource/archive/${VIRTUOSO_COMMIT}.tar.gz RUN tar xzf ${VIRTUOSO_COMMIT}.tar.gz WORKDIR virtuoso-opensource-${VIRTUOSO_COMMIT} @@ -20,6 +44,9 @@ RUN case "$TARGETPLATFORM" in \ *) export CFLAGS="-O" ;; \ esac \ && ./configure \ + --enable-proj4=/usr/local/lib \ + --enable-geos=/usr/local/lib \ + --enable-shapefileio \ --disable-graphql \ --disable-bpel-vad \ --enable-conductor-vad \ @@ -37,6 +64,7 @@ RUN make && make install FROM ubuntu:22.04 COPY --from=builder /usr/local/virtuoso-opensource /usr/local/virtuoso-opensource +COPY --from=builder /usr/local/lib/ /usr/local/lib RUN apt-get update && apt-get install -y libssl-dev crudini # Add Virtuoso bin to the PATH ENV PATH /usr/local/virtuoso-opensource/bin/:$PATH From ed98ce10957e746a60fdebcc09fda89cb12681af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Dierick?= Date: Tue, 22 Aug 2023 10:56:16 +0200 Subject: [PATCH 2/2] remove arm build for testing feature --- .woodpecker/.feature.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.feature.yml b/.woodpecker/.feature.yml index 4f515e0..84b3f16 100644 --- a/.woodpecker/.feature.yml +++ b/.woodpecker/.feature.yml @@ -5,7 +5,7 @@ pipeline: settings: repo: redpencil/virtuoso tags: ${CI_COMMIT_SOURCE_BRANCH/\//-} - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 when: event: - pull_request