Skip to content

Commit

Permalink
Use latest Scoop API.
Browse files Browse the repository at this point in the history
  • Loading branch information
rebeccacremona committed Dec 5, 2023
1 parent 7d7cbf8 commit 00fd3b4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ services:
- scoop_rest_api_internal

scoop-rest-api:
image: registry.lil.tools/harvardlil/scoop-rest-api:49-ede02b53aea1e3288ba0f892844dbfe0
image: registry.lil.tools/harvardlil/scoop-rest-api:50-395846bdca4194fadbc79ff86b1a1cf4
init: true
tty: true
depends_on:
Expand Down
7 changes: 4 additions & 3 deletions services/docker/scoop-rest-api/config.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This is the default config.py from the Scoop REST API as of 11/1/2023
# https://github.com/harvard-lil/scoop-rest-api/blob/26dfc224aafabb53b4af5a44ef9b29cd79d1de82/scoop_rest_api/config.py
# This is the default config.py from the Scoop REST API as of 12/5/2023
# https://github.com/harvard-lil/perma-scoop-api/blob/709d9a96a904698143c811989e37ce91a4265448/scoop_rest_api/config.py
# We only use it to override the blocklist: we disable it to allow the capturing of
# localhost in our test suite.

Expand Down Expand Up @@ -80,6 +80,7 @@
TEMPORARY_STORAGE_EXPIRATION = 60 * 60 * 24
""" How long should temporary files be stored for? (In seconds). Can be provided via an environment variable. """ # noqa

DEPLOYMENT_SENTINEL_PATH = "/tmp/deployment-pending"

#
# API-wide settings
Expand Down Expand Up @@ -152,5 +153,5 @@
- utils.config_check.EXCLUDED_SCOOP_CLI_OPTIONS
"""

SCOOP_TIMEOUT_FUSE = 30
SCOOP_TIMEOUT_FUSE = 35
""" Number of seconds to wait before "killing" a Scoop progress after capture timeout. """

0 comments on commit 00fd3b4

Please sign in to comment.