Skip to content

Commit 1078fb6

Browse files
authored
Merge pull request #18 from gofynd/local-fixes
local fixes
2 parents 714c75a + a744929 commit 1078fb6

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
FROM node:18-alpine AS frontend-builder
2-
WORKDIR /app
3-
COPY ./app/package.json ./app/package-lock.json ./
2+
WORKDIR /frontend
3+
COPY ./frontend/package.json ./frontend/package-lock.json ./
44
RUN npm install
5-
COPY ./app .
5+
COPY ./frontend .
66
RUN npm run build
77
FROM openjdk:17-slim AS backend-builder
8-
WORKDIR /app
8+
WORKDIR /
99
COPY ./pom.xml ./
1010
COPY ./src ./src
1111
RUN apt-get update && apt-get install -y maven && mvn dependency:go-offline -B
12-
COPY --from=frontend-builder /app/build ./src/main/resources/static/
12+
COPY --from=frontend-builder /frontend/public/dist ./src/main/resources/static/
1313
RUN mvn clean package -DskipTests
1414
FROM openjdk:17-slim
15-
WORKDIR /app
16-
COPY --from=backend-builder /app/target/example-extension-java-react-0.0.1-SNAPSHOT.jar ./example-extension-java-react-0.0.1-SNAPSHOT.jar
15+
WORKDIR /
16+
COPY --from=backend-builder target/example-extension-java-react-0.0.1-SNAPSHOT.jar ./example-extension-java-react-0.0.1-SNAPSHOT.jar
1717
COPY src/main/resources/application-prod.yml ./application-prod.yml
1818
ENV SPRING_PROFILES_ACTIVE=prod
1919
EXPOSE 8080

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@
122122
<goal>copy-resources</goal>
123123
</goals>
124124
<configuration>
125-
<outputDirectory>target/classes/static</outputDirectory>
125+
<outputDirectory>src/main/resources/static</outputDirectory>
126126
<resources>
127127
<resource>
128-
<directory>app/build</directory>
128+
<directory>frontend/public/dist</directory>
129129
<filtering>true</filtering>
130130
</resource>
131131
</resources>

0 commit comments

Comments
 (0)