diweddaru i 20.12 (a gwella Makefile/Dockerfile voicebuild)

techiaith · Dec 16, 2020 · 849e7af · 849e7af
1 parent f571da7
commit 849e7af
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 default: build
 
-MARYTTS_CY_VERSION := 20.10
+MARYTTS_CY_VERSION := 20.12
 
 build: 
  if [ ! -d "marytts" ]; then \

diff --git a/voicebuilder/Dockerfile b/voicebuilder/Dockerfile
@@ -1,4 +1,5 @@
-FROM techiaith/marytts:20.10
+ARG BUILDARG_MARYTTS_CY_VERSION
+FROM techiaith/marytts:${BUILDARG_MARYTTS_CY_VERSION}
 
 RUN apt-get update \
  && curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash \

diff --git a/voicebuilder/Makefile b/voicebuilder/Makefile
@@ -1,6 +1,6 @@
 default: build
 
-MARYTTS_CY_VERSION := 20.10
+MARYTTS_CY_VERSION := 20.12
 BANGORDICT_BRANCH := 'master'
 
 # --- MaryTTS voice building environment ------------------------------------------------------
@@ -10,7 +10,7 @@ build: inject_dockerfile_with_uid_gid
  else \
  cd ../marytts/marytts-languages/marytts-lang-cy/lib/modules/cy/lexicon/geiriadur-ynganu-bangor && git pull && git checkout ${BANGORDICT_BRANCH}; \
  fi 
- docker build --rm -t techiaith/marytts-voicebuild:${MARYTTS_CY_VERSION} .
+ docker build --rm --build-arg BUILDARG_MARYTTS_CY_VERSION=${MARYTTS_CY_VERSION} -t techiaith/marytts-voicebuild:${MARYTTS_CY_VERSION} .
 
 inject_dockerfile_with_uid_gid: 
  ./scripts/inject_uid_gid_into_dockerfile.sh