From 19f94c5bbe8ad4e0a38e8a33ce1075733725b568 Mon Sep 17 00:00:00 2001
From: wataru <wataru@fdev.local.com>
Date: Fri, 9 Dec 2022 13:46:45 +0900
Subject: [PATCH] update

---
 demo/MMVCServerSIO.py | 4 ++--
 docker/Dockerfile     | 2 +-
 package.json          | 2 +-
 start2.sh             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/demo/MMVCServerSIO.py b/demo/MMVCServerSIO.py
index 8ed25ee8..a3db4aad 100755
--- a/demo/MMVCServerSIO.py
+++ b/demo/MMVCServerSIO.py
@@ -476,12 +476,12 @@ if __name__ == '__main__':
             path = ""
         else:
             path = "trainer"
-        if EX_PORT and EX_IP and args.https == 1:
+        if "EX_PORT" in locals() and "EX_IP" in locals() and args.https == 1:
             printMessage(f"In many cases it is one of the following", level=1)
             printMessage(f"https://localhost:{EX_PORT}/{path}", level=1)
             for ip in EX_IP.strip().split(" "):
                 printMessage(f"https://{ip}:{EX_PORT}/{path}", level=1)
-        elif EX_PORT and EX_IP and args.https == 0:
+        elif "EX_PORT" in locals() and "EX_IP" in locals() and args.https == 0:
             printMessage(f"In many cases it is one of the following", level=1)
             printMessage(f"http://localhost:{EX_PORT}/{path}", level=1)
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a082d438..9bc54e2d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM dannadori/voice-changer-internal:20221209_112157 as front
+FROM dannadori/voice-changer-internal:20221209_133940 as front
 FROM debian:bullseye-slim as base
 
 ARG DEBIAN_FRONTEND=noninteractive
diff --git a/package.json b/package.json
index e5ec8298..034bb82c 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "build:docker": "date +%Y%m%d%H%M%S > docker/dummy && DOCKER_BUILDKIT=1 docker build -f docker/Dockerfile docker/ -t voice-changer",
     "build:docker_arm64": "date +%Y%m%d%H%M%S > docker/dummy && DOCKER_BUILDKIT=1 docker build -f docker/Dockerfile_arm64 docker/ -t voice-changer-arm64",
     "copy:frontend":"docker run -v `pwd`/frontend/dist:/frontend/dist --entrypoint /bin/bash -ti voice-changer -c \"cp -r /voice-changer-internal/frontend/dist/* /frontend/dist\"",
-    "copy:backend":"docker run -v `pwd`/demo:/demo --entrypoint /bin/bash -ti voice-changer -c \"cp -r /voice-changer-internal/voice-change-service/* /demo/\"",
+    "copy:backend":"docker run -v `pwd`/demo:/demo --entrypoint /bin/bash -ti voice-changer -c \"cp -r /voice-changer-internal/voice-change-service/* /demo/ && rm -rf /demo/MMVC_Trainer/.git && rm -rf /demo/MMVC_Trainer/.gitignore \"",
     "create:demo":"run-p copy:frontend copy:backend",
     "push:docker": "bash script/001_pushDocker.sh",
     "push:docker_arm64": "bash script/002_pushDocker_arm64.sh",
diff --git a/start2.sh b/start2.sh
index 9de20aed..b6eb4b97 100644
--- a/start2.sh
+++ b/start2.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eu
 
-DOCKER_IMAGE=dannadori/voice-changer:20221209_124332
+DOCKER_IMAGE=dannadori/voice-changer:20221209_134116
 # DOCKER_IMAGE=voice-changer
 
 if [ $# = 0 ]; then