Skip to content

Commit

Permalink
[Docker] Fix Docker not working on some devices (#1694)
Browse files Browse the repository at this point in the history
* Lokale Änderungen an package-lock.json

* chore: remove modules/fbs-core/web/package-lock.json

* chore: restore modules/fbs-core/web/package-lock.json

---------

Co-authored-by: Awet Issac <[email protected]>
  • Loading branch information
AwetIssac and AwedIssac authored Oct 17, 2024
1 parent 73630e1 commit 28a3072
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ services:
context: modules/fbs-eat/eat
restart: always
ports:
- 5000:8050
- 5001:8050
networks:
- fbs
environment:
Expand Down
7 changes: 4 additions & 3 deletions modules/fbs-core/api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gradle:jdk18 AS BUILD
FROM gradle:jdk18 AS build

RUN mkdir /build
WORKDIR /build
Expand All @@ -14,6 +14,7 @@ COPY modules/fbs-runner/checker/*.gradle /build/modules/fbs-runner/checker/

# Build web
COPY modules/fbs-core/web /build/modules/fbs-core/web/
RUN apt-get update && apt-get install -y build-essential curl
RUN gradle fbs-core.web:installDist

# Copy math-parser
Expand All @@ -23,9 +24,9 @@ COPY modules/fbs-core/math-parser /build/modules/fbs-core/math-parser/
COPY modules/fbs-core/api /build/modules/fbs-core/api/
RUN gradle fbs-core.web:copyWebToWS fbs-core.api:installDist

FROM eclipse-temurin:18.0.2_9-jre-alpine
FROM eclipse-temurin:18-jre

RUN apk add --no-cache curl
RUN apt-get update && apt-get install -y curl

COPY --from=build /build/modules/fbs-core/api/build/install/fbs-core.api /usr/local/fbs-core.api

Expand Down

0 comments on commit 28a3072

Please sign in to comment.