Fix paths in Dockerfile and removed accidental target dir additions

snyk-labs · Dec 16, 2021 · ee890a8 · ee890a8
1 parent 6ce14a5
commit ee890a8
Show file tree

Hide file tree

Showing 167 changed files with 4 additions and 2,430 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 *.iml
 .idea
-*/target/**
+**/target/**
 **/.DS_Store
diff --git a/todolist-goof/Dockerfile → Dockerfile b/todolist-goof/Dockerfile → Dockerfile
@@ -8,7 +8,7 @@ RUN --mount=target=$HOME/.m2,type=cache mvn install
 FROM tomcat:8.5.21
 
 RUN mkdir /tmp/extracted_files
-COPY --chown=tomcat:tomcat web.xml /usr/local/tomcat/conf/web.xml
-COPY --from=build /usr/src/goof/todolist-web-struts/target/todolist.war /usr/local/tomcat/webapps/todolist.war
+COPY --chown=tomcat:tomcat todolist-goof/web.xml /usr/local/tomcat/conf/web.xml
+COPY --from=build /usr/src/goof/todolist-goof/todolist-web-struts/target/todolist /usr/local/tomcat/webapps/todolist
 COPY --from=build /usr/local/openjdk-8/bin/native2ascii /docker-java-home/jre/bin/native2ascii
-COPY --from=build /usr/local/openjdk-8/lib/tools.jar /docker-java-home/jre/lib/tools.jar
+COPY --from=build /usr/local/openjdk-8/lib/tools.jar /docker-java-home/jre/lib/tools.jar
diff --git a/todolist-goof/todolist-core/target/classes/META-INF/persistence.xml b/todolist-goof/todolist-core/target/classes/META-INF/persistence.xml
diff --git a/todolist-goof/todolist-core/target/classes/META-INF/spring/application-context.xml b/todolist-goof/todolist-core/target/classes/META-INF/spring/application-context.xml
diff --git a/todolist-goof/todolist-core/target/classes/META-INF/spring/infrastructure-context.xml b/todolist-goof/todolist-core/target/classes/META-INF/spring/infrastructure-context.xml
diff --git a/todolist-goof/todolist-core/target/classes/config/data.sql b/todolist-goof/todolist-core/target/classes/config/data.sql
diff --git a/todolist-goof/todolist-core/target/classes/config/database.properties b/todolist-goof/todolist-core/target/classes/config/database.properties
diff --git a/todolist-goof/todolist-core/target/classes/config/hibernate.properties b/todolist-goof/todolist-core/target/classes/config/hibernate.properties
diff --git a/todolist-goof/todolist-core/target/classes/config/schema.sql b/todolist-goof/todolist-core/target/classes/config/schema.sql
diff --git a/todolist-goof/todolist-core/target/classes/io/github/todolist/core/Statics.class b/todolist-goof/todolist-core/target/classes/io/github/todolist/core/Statics.class
diff --git a/todolist-goof/todolist-core/target/classes/io/github/todolist/core/domain/Priority.class b/todolist-goof/todolist-core/target/classes/io/github/todolist/core/domain/Priority.class
diff --git a/todolist-goof/todolist-core/target/classes/io/github/todolist/core/domain/Todo.class b/todolist-goof/todolist-core/target/classes/io/github/todolist/core/domain/Todo.class
diff --git a/todolist-goof/todolist-core/target/classes/io/github/todolist/core/domain/User.class b/todolist-goof/todolist-core/target/classes/io/github/todolist/core/domain/User.class
diff --git a/.../todolist-core/target/classes/io/github/todolist/core/repository/api/TodoRepository.class b/.../todolist-core/target/classes/io/github/todolist/core/repository/api/TodoRepository.class
diff --git a/.../todolist-core/target/classes/io/github/todolist/core/repository/api/UserRepository.class b/.../todolist-core/target/classes/io/github/todolist/core/repository/api/UserRepository.class
diff --git a/...list-core/target/classes/io/github/todolist/core/repository/impl/TodoRepositoryImpl.class b/...list-core/target/classes/io/github/todolist/core/repository/impl/TodoRepositoryImpl.class
diff --git a/...list-core/target/classes/io/github/todolist/core/repository/impl/UserRepositoryImpl.class b/...list-core/target/classes/io/github/todolist/core/repository/impl/UserRepositoryImpl.class
diff --git a/...t-goof/todolist-core/target/classes/io/github/todolist/core/service/api/TodoService.class b/...t-goof/todolist-core/target/classes/io/github/todolist/core/service/api/TodoService.class
diff --git a/...t-goof/todolist-core/target/classes/io/github/todolist/core/service/api/UserService.class b/...t-goof/todolist-core/target/classes/io/github/todolist/core/service/api/UserService.class
diff --git a/...f/todolist-core/target/classes/io/github/todolist/core/service/impl/TodoServiceImpl.class b/...f/todolist-core/target/classes/io/github/todolist/core/service/impl/TodoServiceImpl.class
diff --git a/...f/todolist-core/target/classes/io/github/todolist/core/service/impl/UserServiceImpl.class b/...f/todolist-core/target/classes/io/github/todolist/core/service/impl/UserServiceImpl.class
diff --git a/todolist-goof/todolist-core/target/classes/log4j.properties b/todolist-goof/todolist-core/target/classes/log4j.properties
diff --git a/todolist-goof/todolist-core/target/maven-archiver/pom.properties b/todolist-goof/todolist-core/target/maven-archiver/pom.properties
diff --git a/...t-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/...t-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
diff --git a/...ist-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/...ist-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
diff --git a/...arget/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/...arget/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
diff --git a/.../target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/.../target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
diff --git a/...of/todolist-core/target/surefire-reports/TEST-io.github.todolist.core.TodoServiceTest.xml b/...of/todolist-core/target/surefire-reports/TEST-io.github.todolist.core.TodoServiceTest.xml