Skip to content

Commit

Permalink
Merge pull request #260 from jhu-idc/_all_-the-timeouts
Browse files Browse the repository at this point in the history 
Points to timeout-capable buildkit images, and sets reasonable timeouts for dev environment
  • Loading branch information
@birkland
birkland authored Nov 4, 2021
2 parents 5eeb04e + 096758d commit 2bbc933
Show file tree
Hide file tree
Showing 3 changed files with 156 additions and 2 deletions.
30 changes: 29 additions & 1 deletion .env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ REPOSITORY=ghcr.io/jhu-sheridan-libraries/idc-isle-dc

# The version of the isle-buildkit images, non isle-buildkit images have
# their versions specified explicitly in their respective docker-compose files.
TAG=upstream-20200824-f8d1e8e-60-g891acc8
TAG=upstream-20200824-f8d1e8e-61-g1d7120b

# Docker image and tag for snapshot image
SNAPSHOT_TAG=upstream-20201007-739693ae-405-g521b43f.1630614319
Expand Down Expand Up @@ -102,6 +102,34 @@ DRUPAL_DEFAULT_S3_PRIVATE_PATH=pr
# Google Tag Manager
DRUPAL_GTM_CONTAINER_ID=

# PHP variables
PHP_DEFAULT_SOCKET_TIMEOUT=3600
PHP_MAX_EXECUTION_TIME=3600
PHP_MAX_FILE_UPLOADS=20
PHP_MAX_INPUT_TIME=3600
PHP_MEMORY_LIMIT=256M
PHP_POST_MAX_SIZE=128M
PHP_PROCESS_CONTROL_TIMEOUT=3600
PHP_REQUEST_TERMINATE_TIMEOUT=3600
PHP_UPLOAD_MAX_FILESIZE=128M

# nginx variables
NGINX_CLIENT_BODY_TIMEOUT=3600
NGINX_FASTCGI_READ_TIMEOUT=3600
NGINX_FASTCGI_SEND_TIMEOUT=3600
NGINX_FASTCGI_CONNECT_TIMEOUT=3600
NGINX_KEEPALIVE_TIMEOUT=3600
NGINX_LINGERING_TIMEOUT=3600
NGINX_PROXY_READ_TIMEOUT=3600
NGINX_PROXY_SEND_TIMEOUT=3600
NGINX_PROXY_CONNECT_TIMEOUT=3600
NGINX_SEND_TIMEOUT=3600

# Alpaca timeouts
ALPACA_HTTP_CONNECTION_REQUEST_TIMEOUT_MS=7200000
ALPACA_HTTP_CONNECT_TIMEOUT_MS=7200000
ALPACA_HTTP_SOCKET_TIMEOUT_MS=7200000

# Testing
TEST_OPERATION_TIMEOUT_MS=60000
MIGRATION_ASSETS_IMAGE_TAG=e3a9c50.1633729168
Expand Down
100 changes: 99 additions & 1 deletion docker-compose.env.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,32 @@ services:
# Password for admin user: https://karaf.apache.org/manual/latest/security
#
ALPACA_KARAF_ADMIN_PASSWORD: password
ALPACA_HTTP_CONNECTION_REQUEST_TIMEOUT_MS: ${ALPACA_HTTP_CONNECTION_REQUEST_TIMEOUT_MS:-7200000}
ALPACA_HTTP_CONNECT_TIMEOUT_MS: ${ALPACA_HTTP_CONNECT_TIMEOUT_MS:-7200000}
ALPACA_HTTP_SOCKET_TIMEOUT_MS: ${ALPACA_HTTP_SOCKET_TIMEOUT_MS:-7200000}
cantaloupe:
# No environment variables require overriding.
crayfits:
# No environment variables require overriding.
environment:
NGINX_CLIENT_BODY_TIMEOUT: ${NGINX_CLIENT_BODY_TIMEOUT:-3600}
NGINX_FASTCGI_READ_TIMEOUT: ${NGINX_FASTCGI_READ_TIMEOUT:-3600}
NGINX_FASTCGI_SEND_TIMEOUT: ${NGINX_FASTCGI_SEND_TIMEOUT:-3600}
NGINX_FASTCGI_CONNECT_TIMEOUT: ${NGINX_FASTCGI_CONNECT_TIMEOUT:-3600}
NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-3600}
NGINX_LINGERING_TIMEOUT: ${NGINX_LINGERING_TIMEOUT:-3600}
NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600}
NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600}
NGINX_PROXY_CONNECT_TIMEOUT: ${NGINX_PROXY_CONNECT_TIMEOUT:-3600}
NGINX_SEND_TIMEOUT: ${NGINX_SEND_TIMEOUT:-3600}
PHP_DEFAULT_SOCKET_TIMEOUT: ${PHP_DEFAULT_SOCKET_TIMEOUT:-3600}
PHP_MAX_EXECUTION_TIME: ${PHP_MAX_EXECUTION_TIME:-3600}
PHP_MAX_FILE_UPLOADS: ${PHP_MAX_FILE_UPLOADS:-20}
PHP_MAX_INPUT_TIME: ${PHP_MAX_INPUT_TIME:-3600}
PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT:-256M}
PHP_POST_MAX_SIZE: ${PHP_POST_MAX_SIZE:-128M}
PHP_PROCESS_CONTROL_TIMEOUT: ${PHP_PROCESS_CONTROL_TIMEOUT:-3600}
PHP_REQUEST_TERMINATE_TIMEOUT: ${PHP_REQUEST_TERMINATE_TIMEOUT:-3600}
PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE:-128M}
mariadb:
environment:
#
Expand Down Expand Up @@ -172,6 +194,25 @@ services:
DRUPAL_IDP_BASEURL: ${IDP_BASEURL}
DRUPAL_SP_ENTITYID: ${SP_ENTITYID}
DRUPAL_GTM_CONTAINER_ID: ${DRUPAL_GTM_CONTAINER_ID}
NGINX_CLIENT_BODY_TIMEOUT: ${NGINX_CLIENT_BODY_TIMEOUT:-3600}
NGINX_FASTCGI_READ_TIMEOUT: ${NGINX_FASTCGI_READ_TIMEOUT:-3600}
NGINX_FASTCGI_SEND_TIMEOUT: ${NGINX_FASTCGI_SEND_TIMEOUT:-3600}
NGINX_FASTCGI_CONNECT_TIMEOUT: ${NGINX_FASTCGI_CONNECT_TIMEOUT:-3600}
NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-3600}
NGINX_LINGERING_TIMEOUT: ${NGINX_LINGERING_TIMEOUT:-3600}
NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600}
NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600}
NGINX_PROXY_CONNECT_TIMEOUT: ${NGINX_PROXY_CONNECT_TIMEOUT:-3600}
NGINX_SEND_TIMEOUT: ${NGINX_SEND_TIMEOUT:-3600}
PHP_DEFAULT_SOCKET_TIMEOUT: ${PHP_DEFAULT_SOCKET_TIMEOUT:-3600}
PHP_MAX_EXECUTION_TIME: ${PHP_MAX_EXECUTION_TIME:-3600}
PHP_MAX_FILE_UPLOADS: ${PHP_MAX_FILE_UPLOADS:-20}
PHP_MAX_INPUT_TIME: ${PHP_MAX_INPUT_TIME:-3600}
PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT:-256M}
PHP_POST_MAX_SIZE: ${PHP_POST_MAX_SIZE:-128M}
PHP_PROCESS_CONTROL_TIMEOUT: ${PHP_PROCESS_CONTROL_TIMEOUT:-3600}
PHP_REQUEST_TERMINATE_TIMEOUT: ${PHP_REQUEST_TERMINATE_TIMEOUT:-3600}
PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE:-128M}
idp:
environment:
IDP_BASEURL: ${IDP_BASEURL}
Expand All @@ -197,6 +238,25 @@ services:
a3SNje4UXN+/1xUfQskxafP8CKVSr8xxtwzSureiskb5/98moAiutpUtp15yyAm0
rwIDAQAB
-----END PUBLIC KEY-----
NGINX_CLIENT_BODY_TIMEOUT: ${NGINX_CLIENT_BODY_TIMEOUT:-3600}
NGINX_FASTCGI_READ_TIMEOUT: ${NGINX_FASTCGI_READ_TIMEOUT:-3600}
NGINX_FASTCGI_SEND_TIMEOUT: ${NGINX_FASTCGI_SEND_TIMEOUT:-3600}
NGINX_FASTCGI_CONNECT_TIMEOUT: ${NGINX_FASTCGI_CONNECT_TIMEOUT:-3600}
NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-3600}
NGINX_LINGERING_TIMEOUT: ${NGINX_LINGERING_TIMEOUT:-3600}
NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600}
NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600}
NGINX_PROXY_CONNECT_TIMEOUT: ${NGINX_PROXY_CONNECT_TIMEOUT:-3600}
NGINX_SEND_TIMEOUT: ${NGINX_SEND_TIMEOUT:-3600}
PHP_DEFAULT_SOCKET_TIMEOUT: ${PHP_DEFAULT_SOCKET_TIMEOUT:-3600}
PHP_MAX_EXECUTION_TIME: ${PHP_MAX_EXECUTION_TIME:-3600}
PHP_MAX_FILE_UPLOADS: ${PHP_MAX_FILE_UPLOADS:-20}
PHP_MAX_INPUT_TIME: ${PHP_MAX_INPUT_TIME:-3600}
PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT:-256M}
PHP_POST_MAX_SIZE: ${PHP_POST_MAX_SIZE:-128M}
PHP_PROCESS_CONTROL_TIMEOUT: ${PHP_PROCESS_CONTROL_TIMEOUT:-3600}
PHP_REQUEST_TERMINATE_TIMEOUT: ${PHP_REQUEST_TERMINATE_TIMEOUT:-3600}
PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE:-128M}
houdini:
environment:
#
Expand All @@ -216,6 +276,25 @@ services:
a3SNje4UXN+/1xUfQskxafP8CKVSr8xxtwzSureiskb5/98moAiutpUtp15yyAm0
rwIDAQAB
-----END PUBLIC KEY-----
NGINX_CLIENT_BODY_TIMEOUT: ${NGINX_CLIENT_BODY_TIMEOUT:-3600}
NGINX_FASTCGI_READ_TIMEOUT: ${NGINX_FASTCGI_READ_TIMEOUT:-3600}
NGINX_FASTCGI_SEND_TIMEOUT: ${NGINX_FASTCGI_SEND_TIMEOUT:-3600}
NGINX_FASTCGI_CONNECT_TIMEOUT: ${NGINX_FASTCGI_CONNECT_TIMEOUT:-3600}
NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-3600}
NGINX_LINGERING_TIMEOUT: ${NGINX_LINGERING_TIMEOUT:-3600}
NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600}
NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600}
NGINX_PROXY_CONNECT_TIMEOUT: ${NGINX_PROXY_CONNECT_TIMEOUT:-3600}
NGINX_SEND_TIMEOUT: ${NGINX_SEND_TIMEOUT:-3600}
PHP_DEFAULT_SOCKET_TIMEOUT: ${PHP_DEFAULT_SOCKET_TIMEOUT:-3600}
PHP_MAX_EXECUTION_TIME: ${PHP_MAX_EXECUTION_TIME:-3600}
PHP_MAX_FILE_UPLOADS: ${PHP_MAX_FILE_UPLOADS:-20}
PHP_MAX_INPUT_TIME: ${PHP_MAX_INPUT_TIME:-3600}
PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT:-256M}
PHP_POST_MAX_SIZE: ${PHP_POST_MAX_SIZE:-128M}
PHP_PROCESS_CONTROL_TIMEOUT: ${PHP_PROCESS_CONTROL_TIMEOUT:-3600}
PHP_REQUEST_TERMINATE_TIMEOUT: ${PHP_REQUEST_TERMINATE_TIMEOUT:-3600}
PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE:-128M}
hypercube:
environment:
#
Expand All @@ -235,6 +314,25 @@ services:
a3SNje4UXN+/1xUfQskxafP8CKVSr8xxtwzSureiskb5/98moAiutpUtp15yyAm0
rwIDAQAB
-----END PUBLIC KEY-----
NGINX_CLIENT_BODY_TIMEOUT: ${NGINX_CLIENT_BODY_TIMEOUT:-3600}
NGINX_FASTCGI_READ_TIMEOUT: ${NGINX_FASTCGI_READ_TIMEOUT:-3600}
NGINX_FASTCGI_SEND_TIMEOUT: ${NGINX_FASTCGI_SEND_TIMEOUT:-3600}
NGINX_FASTCGI_CONNECT_TIMEOUT: ${NGINX_FASTCGI_CONNECT_TIMEOUT:-3600}
NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-3600}
NGINX_LINGERING_TIMEOUT: ${NGINX_LINGERING_TIMEOUT:-3600}
NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600}
NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600}
NGINX_PROXY_CONNECT_TIMEOUT: ${NGINX_PROXY_CONNECT_TIMEOUT:-3600}
NGINX_SEND_TIMEOUT: ${NGINX_SEND_TIMEOUT:-3600}
PHP_DEFAULT_SOCKET_TIMEOUT: ${PHP_DEFAULT_SOCKET_TIMEOUT:-3600}
PHP_MAX_EXECUTION_TIME: ${PHP_MAX_EXECUTION_TIME:-3600}
PHP_MAX_FILE_UPLOADS: ${PHP_MAX_FILE_UPLOADS:-20}
PHP_MAX_INPUT_TIME: ${PHP_MAX_INPUT_TIME:-3600}
PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT:-256M}
PHP_POST_MAX_SIZE: ${PHP_POST_MAX_SIZE:-128M}
PHP_PROCESS_CONTROL_TIMEOUT: ${PHP_PROCESS_CONTROL_TIMEOUT:-3600}
PHP_REQUEST_TERMINATE_TIMEOUT: ${PHP_REQUEST_TERMINATE_TIMEOUT:-3600}
PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE:-128M}
minio:
environment:
MINIO_ACCESS_KEY: ${DRUPAL_DEFAULT_S3_ACCESS_KEY}
Expand Down
28 changes: 28 additions & 0 deletions sample.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,31 @@ REPOSITORY=islandora
# The version of the isle-buildkit images, non isle-buildkit images have
# their versions specified explicitly in their respective docker-compose files.
TAG=latest

# PHP variables
PHP_DEFAULT_SOCKET_TIMEOUT=3600
PHP_MAX_EXECUTION_TIME=3600
PHP_MAX_FILE_UPLOADS=20
PHP_MAX_INPUT_TIME=3600
PHP_MEMORY_LIMIT=256M
PHP_POST_MAX_SIZE=128M
PHP_PROCESS_CONTROL_TIMEOUT=3600
PHP_REQUEST_TERMINATE_TIMEOUT=3600
PHP_UPLOAD_MAX_FILESIZE=128M

# nginx variables
NGINX_CLIENT_BODY_TIMEOUT=3600
NGINX_FASTCGI_READ_TIMEOUT=3600
NGINX_FASTCGI_SEND_TIMEOUT=3600
NGINX_FASTCGI_CONNECT_TIMEOUT=3600
NGINX_KEEPALIVE_TIMEOUT=3600
NGINX_LINGERING_TIMEOUT=3600
NGINX_PROXY_READ_TIMEOUT=3600
NGINX_PROXY_SEND_TIMEOUT=3600
NGINX_PROXY_CONNECT_TIMEOUT=3600
NGINX_SEND_TIMEOUT=3600

# Alpaca timeouts
ALPACA_HTTP_CONNECTION_REQUEST_TIMEOUT_MS=7200000
ALPACA_HTTP_CONNECT_TIMEOUT_MS=7200000
ALPACA_HTTP_SOCKET_TIMEOUT_MS=7200000

0 comments on commit 2bbc933

Please sign in to comment.