Skip to content
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

Jump to bottom

build: bump fuseki base container version #1946

Merged
merged 8 commits into from Nov 23, 2021
Merged

build: bump fuseki base container version #1946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f8e5669
build: bump fuseki base container version
subotic Nov 20, 2021
744431e
build: remove unused tag variables
subotic Nov 21, 2021
1ba7690
build: remove tag from image
subotic Nov 21, 2021
64e272a
chore: remove outdated contact informations
subotic Nov 21, 2021
e2dee78
build: bump fuseki image version
subotic Nov 22, 2021
b9612ea
build: bump fuseki image version
subotic Nov 22, 2021
c5d14f3
build: bump fuseki image version
subotic Nov 22, 2021
47a15ab
Merge branch 'main' into wip/DEV-249-bump-fuseki-container-version
subotic Nov 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 0 additions & 11 deletions README.md
View file
Open in desktop
Expand Up @@ -175,17 +175,6 @@ A pull request should include tests and documentation for the changes that were
made. See the [documentation README](https://github.com/dasch-swiss/knora-api/blob/main/docs/Readme.md)
for information on writing Knora documentation.

## Contact information

### Technical

Please use the [discuss.dasch.swiss](https://discuss.dasch.swiss) forum for
technical questions.

### Administrative

Lukas Rosenthaler `<lukas.rosenthaler@unibas.ch>`

## Commit Message Schema

When writing commit messages, we follow the [Conventional Commit messages](https://www.conventionalcommits.org/) rules.
Expand Down
2 changes: 0 additions & 2 deletions WORKSPACE
View file
Open in desktop
Expand Up @@ -74,15 +74,13 @@ container_pull(
digest = SIPI_IMAGE_DIGEST,
registry = "docker.io",
repository = SIPI_REPOSITORY,
# tag = SIPI_VERSION,
)

container_pull(
name = "jenafuseki",
digest = FUSEKI_IMAGE_DIGEST,
registry = "docker.io",
repository = FUSEKI_REPOSITORY,
# tag = FUSEKI_VERSION,
)

#####################################
Expand Down
8 changes: 4 additions & 4 deletions third_party/versions.bzl
View file
Open in desktop
Expand Up @@ -9,11 +9,11 @@ METRICS_VERSION = "4.0.1"
# SIPI - digest takes precedence!
SIPI_REPOSITORY = "daschswiss/sipi"
SIPI_VERSION = "3.3.0"
SIPI_IMAGE = SIPI_REPOSITORY + ":" + SIPI_VERSION
SIPI_IMAGE = SIPI_REPOSITORY
SIPI_IMAGE_DIGEST = "sha256:24ff26999d3727aa4a0c4751fc5706761cea01e9df02e08e676160f234d8506d"

# Jena Fuseki - digest takes precedence!
FUSEKI_REPOSITORY = "daschswiss/apache-jena-fuseki"
FUSEKI_VERSION = "1.0.5" # contains Fuseki 3.16
FUSEKI_IMAGE = FUSEKI_REPOSITORY + ":" + FUSEKI_VERSION
FUSEKI_IMAGE_DIGEST = "sha256:5caba3d092ccc04fe8dc988137d97c012b020eeb649f439511429d6b4ae467ec"
FUSEKI_VERSION = "2.0.2" # contains Fuseki 4.2.0
FUSEKI_IMAGE = FUSEKI_REPOSITORY
FUSEKI_IMAGE_DIGEST = "sha256:7b04aa3a9b51a419948f1cd92ce6504435b9930726a2f714be2e37bd7a32e624"
2 changes: 1 addition & 1 deletion webapi/scripts/fuseki-functions.sh
View file
Open in desktop
Expand Up @@ -79,7 +79,7 @@ create-repository() {
}

upload-graph() {
STATUS=$(curl -s -o /dev/null -w '%{http_code}' -u ${USER_NAME}:${PASSWORD} -H "Content-Type:text/turtle; charset=utf-8" --data-binary @$1 -X PUT http://${HOST}/${REPOSITORY}\?graph\="$2")
STATUS=$(curl -s -o /dev/null -w '%{http_code}' -u ${USER_NAME}:${PASSWORD} -H "Content-Type:text/turtle; charset=utf-8" --data-binary @$1 -X PUT http://${HOST}/${REPOSITORY}/data\?graph\="$2")

if [ "${STATUS}" -eq 201 ]; then
echo "==> 201 Created: $1 -> $2"
Expand Down
2 changes: 1 addition & 1 deletion webapi/scripts/fuseki-repository-config.ttl.template
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@
text:dataset :tdb_dataset_readwrite ;
text:index :indexLucene .

# A TDB datset used for RDF storage
# A TDB2 dataset used for RDF storage
:tdb_dataset_readwrite a tdb2:DatasetTDB2 ;
tdb2:unionDefaultGraph true ;
tdb2:location "/fuseki/databases/@REPOSITORY@" .
Expand Down