Skip to content

Commit

Permalink
chore: bump start-stack to 2023.03.02 (DEV-1819) (#317)
Browse files Browse the repository at this point in the history
  • Loading branch information
jnussbaum committed Mar 21, 2023
1 parent cf90269 commit 54a4514
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/dsp_tools/resources/start-stack/docker-compose.yml
Expand Up @@ -3,7 +3,7 @@ version: '3.7'
services:

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

sipi:
image: daschswiss/knora-sipi:27.1.0 # on the verge of every deployment (fortnightly), take the same tag as DSP-API
image: daschswiss/knora-sipi:28.0.0 # on the verge of every deployment (fortnightly), take the same tag as DSP-API
ports:
- "1024:1024"
volumes:
Expand All @@ -44,7 +44,7 @@ services:
command: --config=/docker/sipi.docker-config.lua

api:
image: daschswiss/knora-api:27.1.0 # on the verge of every deployment (fortnightly),
image: daschswiss/knora-api:28.0.0 # on the verge of every deployment (fortnightly),
# take the tag of https://hub.docker.com/r/daschswiss/knora-api/tags
# that corresponds to the version
# on https://admin.staging.dasch.swiss/help
Expand Down
2 changes: 1 addition & 1 deletion src/dsp_tools/utils/stack_handling.py
Expand Up @@ -49,7 +49,7 @@ def start_stack(
shutil.copy(file_path, docker_path_of_user / file.name)

# get sipi.docker-config.lua
commit_of_used_api_version = "d573a9efafc2b0f8864f4d3c64963cd1e9f6fb65"
commit_of_used_api_version = "55a91852b8583d907a0be9b954c3208837b3684c"
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
2 changes: 1 addition & 1 deletion test/e2e/test_user.py
Expand Up @@ -136,7 +136,7 @@ def test_user_update_basic_information(self) -> None:
self.assertFalse(updated_user.status)
self.assertFalse(updated_user.sysadmin)

@pytest.mark.skip(reason="error in DSP-API, investigate later and make a hotfix")
@pytest.mark.skip(reason="error in DSP-API, try to unignore at next deployment")
def test_user_update_password(self) -> None:
user_email = 'wilee.coyote5@canyon.com'
user_new_pw = 'BeepBeep5.2'
Expand Down

0 comments on commit 54a4514

Please sign in to comment.