mirror of
https://github.com/DSpace/DSpace.git
synced 2025-10-07 10:04:21 +00:00
Update docker files for the 8_x branch
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
# This image will be published as dspace/dspace
|
||||
# See https://github.com/DSpace/DSpace/tree/main/dspace/src/main/docker for usage details
|
||||
#
|
||||
# - note: default tag for branch: dspace/dspace: dspace/dspace:latest
|
||||
# - note: default tag for branch: dspace/dspace: dspace/dspace:dspace-8_x
|
||||
|
||||
# This Dockerfile uses JDK17 by default.
|
||||
# To build with other versions, use "--build-arg JDK_VERSION=[value]"
|
||||
ARG JDK_VERSION=17
|
||||
ARG DSPACE_VERSION=latest
|
||||
ARG DSPACE_VERSION=dspace-8_x
|
||||
|
||||
# Step 1 - Run Maven Build
|
||||
FROM dspace/dspace-dependencies:${DSPACE_VERSION} AS build
|
||||
|
@@ -1,12 +1,12 @@
|
||||
# This image will be published as dspace/dspace-cli
|
||||
# See https://github.com/DSpace/DSpace/tree/main/dspace/src/main/docker for usage details
|
||||
#
|
||||
# - note: default tag for branch: dspace/dspace-cli: dspace/dspace-cli:latest
|
||||
# - note: default tag for branch: dspace/dspace-cli: dspace/dspace-cli:dspace-8_x
|
||||
|
||||
# This Dockerfile uses JDK17 by default.
|
||||
# To build with other versions, use "--build-arg JDK_VERSION=[value]"
|
||||
ARG JDK_VERSION=17
|
||||
ARG DSPACE_VERSION=latest
|
||||
ARG DSPACE_VERSION=dspace-8_x
|
||||
|
||||
# Step 1 - Run Maven Build
|
||||
FROM dspace/dspace-dependencies:${DSPACE_VERSION} AS build
|
||||
|
@@ -1,14 +1,14 @@
|
||||
# This image will be published as dspace/dspace
|
||||
# See https://github.com/DSpace/DSpace/tree/main/dspace/src/main/docker for usage details
|
||||
#
|
||||
# - note: default tag for branch: dspace/dspace: dspace/dspace:latest-test
|
||||
# - note: default tag for branch: dspace/dspace: dspace/dspace:8_x-test
|
||||
#
|
||||
# This image is meant for TESTING/DEVELOPMENT ONLY as it deploys the old v6 REST API under HTTP (not HTTPS)
|
||||
|
||||
# This Dockerfile uses JDK17 by default.
|
||||
# To build with other versions, use "--build-arg JDK_VERSION=[value]"
|
||||
ARG JDK_VERSION=17
|
||||
ARG DSPACE_VERSION=latest
|
||||
ARG DSPACE_VERSION=dspace-8_x
|
||||
|
||||
# Step 1 - Run Maven Build
|
||||
FROM dspace/dspace-dependencies:${DSPACE_VERSION} AS build
|
||||
|
@@ -6,7 +6,7 @@ networks:
|
||||
external: true
|
||||
services:
|
||||
dspace-cli:
|
||||
image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-latest}"
|
||||
image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-8_x}"
|
||||
container_name: dspace-cli
|
||||
build:
|
||||
context: .
|
||||
|
@@ -28,7 +28,7 @@ services:
|
||||
# from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
|
||||
proxies__P__trusted__P__ipranges: '172.23.0'
|
||||
LOGGING_CONFIG: /dspace/config/log4j2-container.xml
|
||||
image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
|
||||
image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-8_x-test}"
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile.test
|
||||
|
Reference in New Issue
Block a user