fix: copy webapp assets to the right location (#24)

odigos-io · Jun 20, 2024 · 065d272 · 065d272
1 parent c42e668
commit 065d272
Show file tree

Hide file tree

Showing 23 changed files with 7 additions and 53 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1 @@
-frontend/src/main/resources/static/
-frontend/src/main/resources/static/404.html
 */dist/
diff --git a/frontend/.gitignore b/frontend/.gitignore
@@ -3,6 +3,7 @@ target/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/
+src/main/resources/static/**
 
 ### STS ###
 .apt_generated

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -2,18 +2,17 @@ FROM node:20-alpine as fe-build
 USER node
 WORKDIR /home/node
 COPY webapp/package* webapp/yarn.lock /home/node/
-RUN ls -lah . && yarn
-
+RUN yarn
 COPY webapp /home/node/
-RUN ls -lah . && yarn build
+RUN yarn build
 
 FROM maven:3.8.5-openjdk-17 AS build
 COPY src /home/app/src
-COPY --from=fe-build /home/node/out/* /home/app/src/main/resources/static/
+COPY --from=fe-build /home/node/out /home/app/src/main/resources/static
 COPY pom.xml /home/app
-RUN mvn -f /home/app/pom.xml clean package
+RUN mvn -f /home/app/pom.xml --no-transfer-progress clean package
 
 FROM eclipse-temurin:17-jre-jammy
 COPY --from=build /home/app/target/*.jar /app/frontend.jar
-USER 15000
+# USER 15000
 CMD ["java", "-jar", "/app/frontend.jar"]
diff --git a/frontend/src/main/resources/static/_next/static/chunks/framework-b39550991c1bc003.js b/frontend/src/main/resources/static/_next/static/chunks/framework-b39550991c1bc003.js
diff --git a/frontend/src/main/resources/static/_next/static/chunks/main-7b07c6a356fe204f.js b/frontend/src/main/resources/static/_next/static/chunks/main-7b07c6a356fe204f.js
diff --git a/frontend/src/main/resources/static/_next/static/chunks/pages/_app-ae907860a06fe57a.js b/frontend/src/main/resources/static/_next/static/chunks/pages/_app-ae907860a06fe57a.js
diff --git a/frontend/src/main/resources/static/_next/static/chunks/pages/_error-54de1933a164a1ff.js b/frontend/src/main/resources/static/_next/static/chunks/pages/_error-54de1933a164a1ff.js
diff --git a/frontend/src/main/resources/static/_next/static/chunks/pages/index-dfc6b803d8ba1c04.js b/frontend/src/main/resources/static/_next/static/chunks/pages/index-dfc6b803d8ba1c04.js
diff --git a/frontend/src/main/resources/static/_next/static/chunks/polyfills-78c92fac7aa8fdd8.js b/frontend/src/main/resources/static/_next/static/chunks/polyfills-78c92fac7aa8fdd8.js
diff --git a/frontend/src/main/resources/static/_next/static/chunks/webpack-8fa1640cc84ba8fe.js b/frontend/src/main/resources/static/_next/static/chunks/webpack-8fa1640cc84ba8fe.js
diff --git a/frontend/src/main/resources/static/_next/static/css/0a4b80bb593e1d15.css b/frontend/src/main/resources/static/_next/static/css/0a4b80bb593e1d15.css
diff --git a/frontend/src/main/resources/static/_next/static/css/e7d3bab42d9af29d.css b/frontend/src/main/resources/static/_next/static/css/e7d3bab42d9af29d.css
diff --git a/frontend/src/main/resources/static/_next/static/media/05a31a2ca4975f99-s.woff2 b/frontend/src/main/resources/static/_next/static/media/05a31a2ca4975f99-s.woff2
diff --git a/frontend/src/main/resources/static/_next/static/media/513657b02c5c193f-s.woff2 b/frontend/src/main/resources/static/_next/static/media/513657b02c5c193f-s.woff2
diff --git a/frontend/src/main/resources/static/_next/static/media/51ed15f9841b9f9d-s.woff2 b/frontend/src/main/resources/static/_next/static/media/51ed15f9841b9f9d-s.woff2
diff --git a/frontend/src/main/resources/static/_next/static/media/c9a5bc6a7c948fb0-s.p.woff2 b/frontend/src/main/resources/static/_next/static/media/c9a5bc6a7c948fb0-s.p.woff2
diff --git a/frontend/src/main/resources/static/_next/static/media/d6b16ce4a6175f26-s.woff2 b/frontend/src/main/resources/static/_next/static/media/d6b16ce4a6175f26-s.woff2
diff --git a/frontend/src/main/resources/static/_next/static/media/ec159349637c90ad-s.woff2 b/frontend/src/main/resources/static/_next/static/media/ec159349637c90ad-s.woff2
diff --git a/frontend/src/main/resources/static/_next/static/media/fd4db3eb5472fc27-s.woff2 b/frontend/src/main/resources/static/_next/static/media/fd4db3eb5472fc27-s.woff2
diff --git a/frontend/src/main/resources/static/favicon.ico b/frontend/src/main/resources/static/favicon.ico
diff --git a/frontend/src/main/resources/static/index.html b/frontend/src/main/resources/static/index.html
@@ -0,0 +1 @@
+Webapp is not build
diff --git a/frontend/src/main/resources/static/next.svg b/frontend/src/main/resources/static/next.svg
diff --git a/frontend/src/main/resources/static/vercel.svg b/frontend/src/main/resources/static/vercel.svg