Skip to content

Commit

Permalink
Merge pull request #702 from RADAR-base/fix/dockerbuild
Browse files Browse the repository at this point in the history
Fix Docker build failing
  • Loading branch information
blootsvoets committed Mar 1, 2023
2 parents b51f736 + 84fc49f commit e7201ff
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions Dockerfile
@@ -1,5 +1,5 @@
# Build stage
FROM azul/zulu-openjdk:11 as builder
FROM --platform=linux/amd64 eclipse-temurin:11-jdk as builder

# Install cURL...
RUN apt-get update && \
Expand Down Expand Up @@ -30,7 +30,7 @@ WORKDIR /app
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.project.prod=true"

COPY package.json yarn.lock /app/
RUN yarn install
RUN yarn install --network-timeout 1000000

COPY gradlew /app/
COPY gradle/wrapper gradle/wrapper
Expand All @@ -55,14 +55,12 @@ COPY src src
RUN ./gradlew -s bootWar

# Run stage
FROM azul/zulu-openjdk-alpine:11-jre-headless
FROM eclipse-temurin:11-jre

ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
JHIPSTER_SLEEP=0 \
JAVA_OPTS=""

RUN apk --no-cache add curl

# Add the war and changelogs files from build stage
COPY --from=builder /app/build/libs/*.war /app.war
COPY --from=builder /app/src/main/docker/etc /mp-includes
Expand Down

0 comments on commit e7201ff

Please sign in to comment.