hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 18:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update docker files for the 8_x branch

Browse Source
This commit is contained in:
Drew Heles
2024-11-21 13:05:19 -05:00
parent 93cbadac4a
commit 3ec8862af8
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@@ -1,12 +1,12 @@
# This image will be published as dspace/dspace # This image will be published as dspace/dspace
# See https://github.com/DSpace/DSpace/tree/main/dspace/src/main/docker for usage details # 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. # This Dockerfile uses JDK17 by default.
# To build with other versions, use "--build-arg JDK_VERSION=[value]" # To build with other versions, use "--build-arg JDK_VERSION=[value]"
ARG JDK_VERSION=17 ARG JDK_VERSION=17
ARG DSPACE_VERSION=latest ARG DSPACE_VERSION=dspace-8_x
# Step 1 - Run Maven Build # Step 1 - Run Maven Build
FROM dspace/dspace-dependencies:${DSPACE_VERSION} AS build FROM dspace/dspace-dependencies:${DSPACE_VERSION} AS build

4
Dockerfile.cli
View File

@@ -1,12 +1,12 @@
# This image will be published as dspace/dspace-cli # This image will be published as dspace/dspace-cli
# See https://github.com/DSpace/DSpace/tree/main/dspace/src/main/docker for usage details # 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. # This Dockerfile uses JDK17 by default.
# To build with other versions, use "--build-arg JDK_VERSION=[value]" # To build with other versions, use "--build-arg JDK_VERSION=[value]"
ARG JDK_VERSION=17 ARG JDK_VERSION=17
ARG DSPACE_VERSION=latest ARG DSPACE_VERSION=dspace-8_x
# Step 1 - Run Maven Build # Step 1 - Run Maven Build
FROM dspace/dspace-dependencies:${DSPACE_VERSION} AS build FROM dspace/dspace-dependencies:${DSPACE_VERSION} AS build

4
Dockerfile.test
View File

@@ -1,14 +1,14 @@
# This image will be published as dspace/dspace # This image will be published as dspace/dspace
# See https://github.com/DSpace/DSpace/tree/main/dspace/src/main/docker for usage details # 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 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. # This Dockerfile uses JDK17 by default.
# To build with other versions, use "--build-arg JDK_VERSION=[value]" # To build with other versions, use "--build-arg JDK_VERSION=[value]"
ARG JDK_VERSION=17 ARG JDK_VERSION=17
ARG DSPACE_VERSION=latest ARG DSPACE_VERSION=dspace-8_x
# Step 1 - Run Maven Build # Step 1 - Run Maven Build
FROM dspace/dspace-dependencies:${DSPACE_VERSION} AS build FROM dspace/dspace-dependencies:${DSPACE_VERSION} AS build

2
docker-compose-cli.yml
View File

@@ -6,7 +6,7 @@ networks:
external: true external: true
services: services:
dspace-cli: 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 container_name: dspace-cli
build: build:
context: . context: .

2
docker-compose.yml
View File

@@ -28,7 +28,7 @@ services:
# from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above. # from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
proxies__P__trusted__P__ipranges: '172.23.0' proxies__P__trusted__P__ipranges: '172.23.0'
LOGGING_CONFIG: /dspace/config/log4j2-container.xml 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: build:
context: . context: .
dockerfile: Dockerfile.test dockerfile: Dockerfile.test