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

chore: bump versions of start-stack to 2023.01.02 (DEV-1652) #290

Merged
merged 2 commits into from
Jan 25, 2023
Merged

chore: bump versions of start-stack to 2023.01.02 (DEV-1652) #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcb2948
bump versions (except of fuseki)
jnussbaum Jan 24, 2023
5bca101
bump fuseki
jnussbaum Jan 25, 2023
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
6 changes: 3 additions & 3 deletions src/dsp_tools/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3.7'
services:

app:
image: daschswiss/dsp-app:v10.11.2 # after every deployment (fortnightly), take the tag of
image: daschswiss/dsp-app:v10.12.1 # after every deployment (fortnightly), take the tag of
# https://hub.docker.com/r/daschswiss/dsp-app/tags that corresponds to the
# version on https://admin.dasch.swiss/help
ports:
Expand All @@ -24,7 +24,7 @@ services:
- JVM_ARGS=-Xmx3G

sipi:
image: daschswiss/knora-sipi:26.0.0 # after every deployment (fortnightly), take the same tag as DSP-API
image: daschswiss/knora-sipi:26.1.0 # after every deployment (fortnightly), take the same tag as DSP-API
ports:
- "1024:1024"
volumes:
Expand All @@ -43,7 +43,7 @@ services:
command: --config=/docker/sipi.docker-config.lua

api:
image: daschswiss/knora-api:26.0.0 # after every deployment (fortnightly), take the tag of
image: daschswiss/knora-api:26.1.0 # after every deployment (fortnightly), take the tag of
# https://hub.docker.com/r/daschswiss/knora-api/tags that corresponds to the
# version on https://admin.dasch.swiss/help
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion src/dsp_tools/utils/stack_handling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def start_stack(
shutil.copy(file, docker_path_of_user / file.name)

# get sipi.docker-config.lua
commit_of_used_api_version = "9d58b520661601721b5d63d27153db135442562e"
commit_of_used_api_version = "558b1c98ec7790118608c16d5dfaf5769a85457a"
url_prefix = f"https://github.com/dasch-swiss/dsp-api/raw/{commit_of_used_api_version}/"
docker_config_lua_text = requests.get(f"{url_prefix}sipi/config/sipi.docker-config.lua").text
if max_file_size:
Expand Down