diff --git a/.gitignore b/.gitignore index 7897340..ca0897a 100644 --- a/.gitignore +++ b/.gitignore @@ -47,4 +47,4 @@ webapp/assets_non_bundled tools/node_modules **/.scala-build docker-dist/webapp/ -docker-dist/*.jar +docker-dist/fileserver/ diff --git a/build-prod.sh b/build-prod.sh index 6b0beb5..8859754 100755 --- a/build-prod.sh +++ b/build-prod.sh @@ -1,6 +1,6 @@ sbt prod -rm docker-dist/*.jar +rm -r docker-dist/fileserver rm -r docker-dist/webapp mkdir -p docker-dist/webapp diff --git a/docker-dist/Dockerfile b/docker-dist/Dockerfile index 2281eff..59abc86 100644 --- a/docker-dist/Dockerfile +++ b/docker-dist/Dockerfile @@ -1,7 +1,7 @@ FROM eclipse-temurin:8-jre-alpine -#COPY ["package.json", "package-lock.json*", "generate-listing.js", "server.js", "refresh-and-run.sh", "/subtitle-search/"] -COPY ["./", "/subtitle-search/"] +ADD ["./webapp", "/subtitle-search/webapp/"] +ADD ["./fileserver", "/subtitle-search/fileserver"] ENV WEBAPP_FOLDER=/subtitle-search/webapp ENV ASSETS_FOLDER=/assets