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.

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

build: dockerize fuseki (dsp-30) #1653

Merged
merged 47 commits into from
Jun 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
9da83f7
build: remove graphdb, add fuseki
subotic Jun 9, 2020
198af81
build: add fuseki db init (ongoing)
subotic Jun 9, 2020
97930ff
build: add fuseki db init (ongoing)
subotic Jun 10, 2020
2ca6947
Merge branch 'develop' into wip/DSP-30-dockerize-fuseki
subotic Jun 10, 2020
cc6e883
build: add fuseki db init (ongoing)
subotic Jun 10, 2020
ad60816
build: add fuseki db init (ongoing)
subotic Jun 11, 2020
ccfd9bb
build: add fuseki db init (ongoing)
subotic Jun 12, 2020
017e699
build: add fuseki db init
subotic Jun 12, 2020
0e16a71
Merge branch 'develop' into wip/DSP-30-dockerize-fuseki
subotic Jun 12, 2020
0c18f07
build: remove graphdb specific settings from github-ci
subotic Jun 12, 2020
c03ae5b
build: fix test upgrade
subotic Jun 12, 2020
3208b24
build: fix upgrade test
subotic Jun 12, 2020
f98adf7
build: fix upgrade test
subotic Jun 13, 2020
cdddafd
test: fix deprecation
subotic Jun 14, 2020
8c38dad
build: add testcontainers (ongoing)
subotic Jun 14, 2020
0e03f2e
build: add deleting of database volumes when init-db-xyz targets are run
subotic Jun 15, 2020
0822b20
build: add testcontainers (ongoing)
subotic Jun 15, 2020
2f0b141
build: add testcontainers (ongoing)
subotic Jun 15, 2020
994769e
build: add testcontainers (ongoing)
subotic Jun 16, 2020
326d3dd
build: add testcontainers (ongoing)
subotic Jun 16, 2020
2e7d550
build: add testcontainers (ongoing)
subotic Jun 16, 2020
ecb233a
docs: update readme
subotic Jun 16, 2020
447a818
build: bump sbt
subotic Jun 16, 2020
b557f3a
build: use build-all-scala on Github-CI
subotic Jun 16, 2020
51b7095
build: add parallel test execution config (ongoing)
subotic Jun 16, 2020
e96356e
build: run ci from inside Docker
subotic Jun 17, 2020
9deb568
build: run ci from inside Docker
subotic Jun 17, 2020
b536a3a
build: fix R2R tests with testcontainers (ongoing)
subotic Jun 17, 2020
e146b40
build: fix R2R tests with testcontainers
subotic Jun 18, 2020
14e3c84
Merge branch 'develop' into wip/DSP-30-dockerize-fuseki
Jun 18, 2020
eca606e
test(gravsearch): Don't use deprecated match() function with Fuseki.
Jun 18, 2020
e4e4e47
build: fix github-ci sbt error {ongoing}
subotic Jun 18, 2020
6b85d8c
Merge branch 'develop' into wip/DSP-30-dockerize-fuseki
subotic Jun 18, 2020
2e13af5
build: fix github-ci sbt error {ongoing}
subotic Jun 22, 2020
3568b06
build: change Fuseki config to TDB2
subotic Jun 22, 2020
30b4255
build: add using adoptopenjdk for github-ci
subotic Jun 22, 2020
54e3d39
doc: make Fuseki more prominent
subotic Jun 22, 2020
0f70b6c
build: fix auto init config
subotic Jun 23, 2020
ff70108
fix (sipi): use correct variable for existence checking
subotic Jun 23, 2020
2e28004
Merge branch 'develop' into wip/DSP-30-dockerize-fuseki
subotic Jun 23, 2020
daf4594
test: fix integration tests (ongoing)
subotic Jun 24, 2020
078931d
Merge branch 'wip/DSP-30-dockerize-fuseki' of github.com:dasch-swiss/…
subotic Jun 24, 2020
70fbc6b
tests: ignore tests requiring shared folder
subotic Jun 25, 2020
2d281d1
Merge branch 'develop' into wip/DSP-30-dockerize-fuseki
subotic Jun 25, 2020
b2be4e0
docs: update readme
subotic Jun 26, 2020
eb5703f
test: update comment
subotic Jun 26, 2020
f117f7b
doc: update comment
subotic Jun 26, 2020
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
3 changes: 1 addition & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
**/.gitignore
**/.idea
docs
private
triplestores
private
76 changes: 26 additions & 50 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ on:
release:
types: [published]

env:
KNORA_GDB_LICENSE: ${{ github.workspace }}/ci/graphdb/UNIBAS_DEV_GRAPHDB_SE_latest-31-12-2020_1cores.license

jobs:
compile:
name: Build Everything
Expand All @@ -16,30 +13,10 @@ jobs:
- uses: actions/checkout@v1
with:
fetch-depth: 1
- name: Dump GitHub context
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: echo "$GITHUB_CONTEXT"
- name: Dump job context
env:
JOB_CONTEXT: ${{ toJson(job) }}
run: echo "$JOB_CONTEXT"
- name: Dump steps context
env:
STEPS_CONTEXT: ${{ toJson(steps) }}
run: echo "$STEPS_CONTEXT"
- name: Dump runner context
env:
RUNNER_CONTEXT: ${{ toJson(runner) }}
run: echo "$RUNNER_CONTEXT"
- name: Dump strategy context
env:
STRATEGY_CONTEXT: ${{ toJson(strategy) }}
run: echo "$STRATEGY_CONTEXT"
- name: Dump matrix context
env:
MATRIX_CONTEXT: ${{ toJson(matrix) }}
run: echo "$MATRIX_CONTEXT"
- uses: joschi/setup-jdk@v2
with:
java-version: '11' # The OpenJDK version to make available on the path
architecture: 'x64' # defaults to 'x64'
- name: cache maven artifacts
uses: actions/cache@v1
with:
Expand All @@ -56,7 +33,7 @@ jobs:
docker system prune --all --force --volumes
df -h
- name: Run build everything
run: sbt clean test:compile it:compile stage
run: make build-all-scala
- name: Disk Free After
run: |
df -h
Expand All @@ -71,12 +48,10 @@ jobs:
uses: actions/checkout@v1
with:
fetch-depth: 1
- name: Checkout private ci-assets
uses: actions/checkout@v2
- uses: joschi/setup-jdk@v2
with:
repository: dasch-swiss/dsp-ci-assets
token: ${{ secrets.GitHub_PAT }} # `GitHub_PAT` is a secret that contains the PAT.
path: ci
java-version: '11' # The OpenJDK version to make available on the path
architecture: 'x64' # defaults to 'x64'
- name: cache maven artifacts
uses: actions/cache@v1
with:
Expand Down Expand Up @@ -112,12 +87,10 @@ jobs:
uses: actions/checkout@v1
with:
fetch-depth: 1
- name: Checkout private ci-assets
uses: actions/checkout@v2
- uses: joschi/setup-jdk@v2
with:
repository: dasch-swiss/dsp-ci-assets
token: ${{ secrets.GitHub_PAT }} # `GitHub_PAT` is a secret that contains the PAT.
path: ci
java-version: '11' # The OpenJDK version to make available on the path
architecture: 'x64' # defaults to 'x64'
- name: cache maven artifacts
uses: actions/cache@v1
with:
Expand Down Expand Up @@ -153,12 +126,10 @@ jobs:
uses: actions/checkout@v1
with:
fetch-depth: 1
- name: Checkout private ci-assets
uses: actions/checkout@v2
- uses: joschi/setup-jdk@v2
with:
repository: dasch-swiss/dsp-ci-assets
token: ${{ secrets.GitHub_PAT }} # `GitHub_PAT` is a secret that contains the PAT.
path: ci
java-version: '11' # The OpenJDK version to make available on the path
architecture: 'x64' # defaults to 'x64'
- name: cache maven artifacts
uses: actions/cache@v1
with:
Expand Down Expand Up @@ -194,12 +165,10 @@ jobs:
uses: actions/checkout@v1
with:
fetch-depth: 1
- name: Checkout private ci-assets
uses: actions/checkout@v2
- uses: joschi/setup-jdk@v2
with:
repository: dasch-swiss/dsp-ci-assets
token: ${{ secrets.GitHub_PAT }} # `GitHub_PAT` is a secret that contains the PAT.
path: ci
java-version: '11' # The OpenJDK version to make available on the path
architecture: 'x64' # defaults to 'x64'
- uses: actions/setup-java@v1
with:
java-version: '11.x.x'
Expand All @@ -221,7 +190,7 @@ jobs:
docker system prune --all --force --volumes
df -h
- name: test repository update
run: cd $GITHUB_WORKSPACE && make test-repository-update
run: make test-repository-update
- name: Disk Free After
run: |
df -h
Expand All @@ -235,6 +204,10 @@ jobs:
- uses: actions/checkout@v1
with:
fetch-depth: 1
- uses: joschi/setup-jdk@v2
with:
java-version: '11' # The OpenJDK version to make available on the path
architecture: 'x64' # defaults to 'x64'
- name: cache maven artifacts
uses: actions/cache@v1
with:
Expand Down Expand Up @@ -276,6 +249,10 @@ jobs:
- uses: actions/checkout@v1
with:
fetch-depth: 50
- uses: joschi/setup-jdk@v2
with:
java-version: '11' # The OpenJDK version to make available on the path
architecture: 'x64' # defaults to 'x64'
- name: cache maven artifacts
uses: actions/cache@v1
with:
Expand All @@ -294,7 +271,6 @@ jobs:
- name: build and publish all images to Dockerhub
run: |
echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_USER }} --password-stdin
mkdir -p $( dirname "$KNORA_GDB_LICENSE") && touch "$KNORA_GDB_LICENSE"
make publish-all-images
- name: Disk Free After
run: |
Expand Down
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@ sipi/test
*.bak
.sbtrc

/knora-jena-fuseki
/knora-sipi
/knora-graphdb-se
/knora-graphdb-free
/knora-assets
/knora-upgrade

Expand All @@ -58,5 +57,5 @@ knora-graphdb-free
knora-graphdb-se
knora-sipi
knora-upgrade
triplestores/fuseki-tomcat/system
triplestores/fuseki/system
dump.rdb
Loading