Skip to content
This repository has been archived by the owner on Jun 21, 2023. It is now read-only.

Commit

Permalink
Include /usr/share/ca-certificates in docker run scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
synesthesiam committed Nov 10, 2021
1 parent 44ecac6 commit 79d3b42
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)" \
Expand Down Expand Up @@ -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)" \
Expand Down
7 changes: 6 additions & 1 deletion docker/larynx
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 6 additions & 2 deletions docker/larynx-server
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 79d3b42

Please sign in to comment.