diff --git a/CHANGELOG b/CHANGELOG index 3e53f5c..301084c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ - With --ssml, input from stdin is assumed to be one document instead of lines (override with --stdin-format lines) - Bump gruut to version 2.1 for inline lexicons +- Include /usr/share/ca-certificates in Docker scripts ## [1.0.0] - 20 Oct 2021 diff --git a/README.md b/README.md index 624c7ef..2b4359a 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,7 @@ docker run \ -p 5002:5002 \ -e "HOME=${HOME}" \ -v "$HOME:${HOME}" \ + -v /usr/share/ca-certificates:/usr/share/ca-certificates \ -v /etc/ssl/certs:/etc/ssl/certs \ -w "${PWD}" \ --user "$(id -u):$(id -g)" \ @@ -275,6 +276,7 @@ docker run \ -p 59125:5002 \ -e "HOME=${HOME}" \ -v "$HOME:${HOME}" \ + -v /usr/share/ca-certificates:/usr/share/ca-certificates \ -v /etc/ssl/certs:/etc/ssl/certs \ -w "${PWD}" \ --user "$(id -u):$(id -g)" \ diff --git a/docker/larynx b/docker/larynx index e69abea..34bfb49 100755 --- a/docker/larynx +++ b/docker/larynx @@ -23,8 +23,13 @@ fi docker_run_args=() -if [[ -d /etc/ssl/certs ]]; then +if [[ -d /usr/share/ca-certificates ]]; then # Map SSL certs path for downloading voices + docker_run_args+=('-v' '/usr/share/ca-certificates:/usr/share/ca-certificates') +fi + +if [[ -d /etc/ssl/certs ]]; then + # This directory seems to usually have symlinks to /usr/share/ca-certificates docker_run_args+=('-v' '/etc/ssl/certs:/etc/ssl/certs') fi diff --git a/docker/larynx-server b/docker/larynx-server index 7e335bb..0fd75ec 100755 --- a/docker/larynx-server +++ b/docker/larynx-server @@ -28,11 +28,15 @@ fi docker_run_args=() -if [[ -d /etc/ssl/certs ]]; then +if [[ -d /usr/share/ca-certificates ]]; then # Map SSL certs path for downloading voices - docker_run_args+=('-v' '/etc/ssl/certs:/etc/ssl/certs') + docker_run_args+=('-v' '/usr/share/ca-certificates:/usr/share/ca-certificates') fi +if [[ -d /etc/ssl/certs ]]; then + # This directory seems to usually have symlinks to /usr/share/ca-certificates + docker_run_args+=('-v' '/etc/ssl/certs:/etc/ssl/certs') +fi "${docker}" run \ -it \