Skip to content

Commit

Permalink
Merge pull request DSpace#9704 from saschaszott/patch-41
Browse files Browse the repository at this point in the history 
Docker build: fix FromAsCasing warnings
  • Loading branch information
@tdonohue
tdonohue authored Jul 17, 2024
2 parents 87e7c98 + bed2396 commit a52508d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG JDK_VERSION=17
ARG DSPACE_VERSION=latest

# Step 1 - Run Maven Build
FROM dspace/dspace-dependencies:${DSPACE_VERSION} as build
FROM dspace/dspace-dependencies:${DSPACE_VERSION} AS build
ARG TARGET_DIR=dspace-installer
WORKDIR /app
# The dspace-installer directory will be written to /install
Expand All @@ -31,7 +31,7 @@ RUN mvn --no-transfer-progress package ${MAVEN_FLAGS} && \
RUN rm -rf /install/webapps/server/

# Step 2 - Run Ant Deploy
FROM eclipse-temurin:${JDK_VERSION} as ant_build
FROM eclipse-temurin:${JDK_VERSION} AS ant_build
ARG TARGET_DIR=dspace-installer
# COPY the /install directory from 'build' container to /dspace-src in this container
COPY --from=build /install /dspace-src
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.cli
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG JDK_VERSION=17
ARG DSPACE_VERSION=latest

# Step 1 - Run Maven Build
FROM dspace/dspace-dependencies:${DSPACE_VERSION} as build
FROM dspace/dspace-dependencies:${DSPACE_VERSION} AS build
ARG TARGET_DIR=dspace-installer
WORKDIR /app
# The dspace-installer directory will be written to /install
Expand All @@ -25,7 +25,7 @@ RUN mvn --no-transfer-progress package && \
mvn clean

# Step 2 - Run Ant Deploy
FROM eclipse-temurin:${JDK_VERSION} as ant_build
FROM eclipse-temurin:${JDK_VERSION} AS ant_build
ARG TARGET_DIR=dspace-installer
# COPY the /install directory from 'build' container to /dspace-src in this container
COPY --from=build /install /dspace-src
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dependencies
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
ARG JDK_VERSION=17

# Step 1 - Run Maven Build
FROM maven:3-eclipse-temurin-${JDK_VERSION} as build
FROM maven:3-eclipse-temurin-${JDK_VERSION} AS build
ARG TARGET_DIR=dspace-installer
WORKDIR /app
# Create the 'dspace' user account & home directory
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ARG JDK_VERSION=17
ARG DSPACE_VERSION=latest

# Step 1 - Run Maven Build
FROM dspace/dspace-dependencies:${DSPACE_VERSION} as build
FROM dspace/dspace-dependencies:${DSPACE_VERSION} AS build
ARG TARGET_DIR=dspace-installer
WORKDIR /app
# The dspace-installer directory will be written to /install
Expand All @@ -30,7 +30,7 @@ RUN mvn --no-transfer-progress package && \
RUN rm -rf /install/webapps/server/

# Step 2 - Run Ant Deploy
FROM eclipse-temurin:${JDK_VERSION} as ant_build
FROM eclipse-temurin:${JDK_VERSION} AS ant_build
ARG TARGET_DIR=dspace-installer
# COPY the /install directory from 'build' container to /dspace-src in this container
COPY --from=build /install /dspace-src
Expand Down

0 comments on commit a52508d

Please sign in to comment.