Skip to content
New issue

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

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

Already on GitHub? # to your account

bump virtuoso to 7.2.9 #14

Merged
merged 2 commits into from
Apr 12, 2023
Merged
Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions .woodpecker/.dry-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ pipeline:
settings:
repo: redpencil/virtuoso
dry_run: true
when:
event:
- pull_request
when:
event:
- pull_request
11 changes: 5 additions & 6 deletions .woodpecker/.feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ pipeline:
secrets: [ docker_username, docker_password ]
settings:
repo: redpencil/virtuoso
tags: ${CI_COMMIT_SOURCE_BRANCH} # strips v from the tag
when:
event:
- push
branches:
- feature/*
tags: ${CI_COMMIT_SOURCE_BRANCH/\//-}
when:
event:
- pull_request
branch: feature/*
9 changes: 4 additions & 5 deletions .woodpecker/.latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ pipeline:
settings:
repo: redpencil/virtuoso
tags: latest
when:
event:
- push
branches:
- master
when:
event:
- push
branch: master
8 changes: 3 additions & 5 deletions .woodpecker/.release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ pipeline:
settings:
repo: redpencil/virtuoso
tags: ${CI_REPO_TAG##v} # strips v from the tag
when:
event: tag
tag: v*
branches:
- master
when:
event: tag
tag: v*
10 changes: 2 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:22.04 as builder

# Set Virtuoso commit SHA to Virtuoso 7.2.8 release (2022-10-19)
ARG VIRTUOSO_COMMIT=64e6ecd39b03383875b7f2f15ed8070e2ebcd1f0
# Set Virtuoso commit SHA to Virtuoso 7.2.9 release (2023-02-27)
ARG VIRTUOSO_COMMIT=795af34a7287f064effd91ed251e6bb711f1f5ee

RUN apt-get update
RUN apt-get install -y build-essential autotools-dev autoconf automake net-tools libtool \
Expand All @@ -10,12 +10,6 @@ RUN wget https://github.com/openlink/virtuoso-opensource/archive/${VIRTUOSO_COMM
RUN tar xzf ${VIRTUOSO_COMMIT}.tar.gz
WORKDIR virtuoso-opensource-${VIRTUOSO_COMMIT}

# See https://github.com/openlink/virtuoso-opensource/blob/9cececaca5df32c82576e5390062475bbf5e1cc1/libsrc/Wi/mkgit_head.sh
# mkgit_head.sh doesn't do what it is expected to do since our downloaded tar doesn't have git history
# Provide libsrc/Wi/git_head.c manually
RUN export VALUE=$(echo $VIRTUOSO_COMMIT | head -c 7); echo "#define GIT_HEAD_STR \"$VALUE\"" > libsrc/Wi/git_head.c
RUN export VALUE=$(echo $VIRTUOSO_COMMIT | head -c 7); echo "char * git_head = \"$VALUE\";" >> libsrc/Wi/git_head.c

# Build virtuoso from source
RUN ./autogen.sh
RUN export CFLAGS="-O2 -m64" \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Docker for hosting Virtuoso.

The Virtuoso is built from a specific commit SHA in https://github.com/openlink/virtuoso-opensource.
This image is currently build from commit [64663f91c657aec14bbdcef8b6e5c9b6ac89cb8b](https://github.com/openlink/virtuoso-opensource/commit/64663f91c657aec14bbdcef8b6e5c9b6ac89cb8b), which corresponds to virtuoso 7.2.6.1. You can build this image from a different commit by providing the correct commit id as the `VIRTUOSO_COMMIT` [build argument](https://docs.docker.com/engine/reference/commandline/build/#set-build-time-variables---build-arg).
This image is currently build from commit [795af34a7287f064effd91ed251e6bb711f1f5ee](https://github.com/openlink/virtuoso-opensource/commit/795af34a7287f064effd91ed251e6bb711f1f5ee), which corresponds to virtuoso 7.2.9. You can build this image from a different commit by providing the correct commit id as the `VIRTUOSO_COMMIT` [build argument](https://docs.docker.com/engine/reference/commandline/build/#set-build-time-variables---build-arg).

## Running your Virtuoso
docker run --name my-virtuoso \
Expand Down