Project

General

Profile

Revision 35066a11

ID35066a115f7951ab9ad8a1755dc10e70842033f8
Parent 4e1dd75e
Child 61c9e055

Added by Andreas Kohlbecker over 1 year ago

ref #6522 cleaning up docker config files

View differences:

pom.xml
479 479
                 <assembly>
480 480
                    <descriptorRef>artifact</descriptorRef>
481 481
                    <!--
482
                         1. The maven plugin copies the jar to the artifacts assembly locaton at:
482
                         1. The maven plugin copies the jar to the artifacts assembly location at:
483 483
                            ./target/docker/eu.etaxonomy/cdm-server/${project.version}/build/maven/cdm-server-${project.version}.jar
484 484
                         2. a tar is being created at target/docker/eu.etaxonomy/cdm-server/${project.version}/tmp/docker-build.tar 
485 485
                            which contains all files located in /target/docker/production and the artifacts. 
src/main/docker/production/Dockerfile
13 13
ADD maven/@project.artifactId@-@project.version@.jar /root/cdm-server.jar
14 14

  
15 15
ARG CDMSERVER_PORT=8080
16
ARG HEAP_SIZE=1024M
16
ARG HEAP_SIZE_ARG=1024M
17 17
ARG LOGDIR="/log/cdmserver"
18 18

  
19 19
ENV CDM_HOME=/data
20
ENV NAME=cdmserver
21
ENV DESC="CDM Server"
22
# ENV CDMSERVER_SHUTDOWN=30
20
ENV HEAP_SIZE=$HEAP_SIZE_ARG
23 21
ENV CPU_CORES=1
24 22
ENV DATASOURCES=$CDM_HOME/.cdmLibrary/datasources.xml
25 23

  
src/main/docker/production/Dockerfile.dev
6 6
ADD target/cdm-server-*.jar /root/cdm-server.jar
7 7

  
8 8
ARG CDMSERVER_PORT=8080
9
ARG HEAP_SIZE=1024M
9
ARG HEAP_SIZE_ARG=1024M
10 10
ARG LOGDIR="/log/cdmserver"
11 11

  
12 12
ENV CDM_HOME=/data
13
ENV NAME=cdmserver
14
ENV DESC="CDM Server"
15
# ENV CDMSERVER_SHUTDOWN=30
13
ENV HEAP_SIZE=$HEAP_SIZE_ARG
16 14
ENV CPU_CORES=1
17 15
ENV DATASOURCES=$CDM_HOME/.cdmLibrary/datasources.xml
18 16

  
src/main/docker/production/cdm-server-dev.env
8 8
##########################################################################
9 9

  
10 10
###
11
# The name of the docker container in RUN mode
12
#NAME=cdmserver
13

  
14
###
15
# Description of the docker container in RUN mode
16
#DESC="CDM Server"
17

  
18
###
19 11
# The home directory for the cdm-server process. At this location the cdm-server will 
20 12
# create the .cdmLibrary folder which will contain per instance configurations,
21 13
# lucene full text index, and other resources
......
35 27
###
36 28
# Alternative options for the JVM
37 29
# You MUST NOT use any of: -Xmx, XX:+UseG1GC -XX:ParallelGCThreads, -XX:ConcGCThreads=, -Duser.home
38
# since these are managed internally in the container
30
# since these are managed internally in the container. 
31
# To set the heap size:
32
#HEAP_SIZE=1024M
33
# all other options can be set in:
39 34
#JAVA_OPTIONS=-Dspring.profiles.active=remoting
40 35

  
41 36
###
src/main/docker/production/cdm-server.env
8 8
##########################################################################
9 9

  
10 10
###
11
# The name of the docker container in RUN mode
12
#NAME=cdmserver
13

  
14
###
15
# Description of the docker container in RUN mode
16
#DESC="CDM Server"
17

  
18
###
19 11
# The home directory for the cdm-server process. At this location the cdm-server will 
20 12
# create the .cdmLibrary folder which will contain per instance configurations,
21 13
# lucene full text index, and other resources
......
35 27
###
36 28
# Alternative options for the JVM
37 29
# You MUST NOT use any of: -Xmx, XX:+UseG1GC -XX:ParallelGCThreads, -XX:ConcGCThreads=, -Duser.home
38
# since these are managed internally in the container
30
# since these are managed internally in the container. 
31
# To set the heap size:
32
#HEAP_SIZE=1024M
33
# all other options can be set in:
39 34
#JAVA_OPTIONS=-Dspring.profiles.active=remoting
40 35

  
41 36
###
src/main/docker/production/docker-compose.yml
14 14
        - type: bind
15 15
          source: /var/log/cdmserver
16 16
          target: /log/cdmserver
17
        # recommended settings for development
18
        #- type: bind
19
        #  source: ~/ # user-home as a cdm-server-home => use the .cdmLibrary in user home
20
        #  target: /data
21
        #- type: bind
22
        #  source: ./ # log directly into the working directory
23
        #  target: /log/cdmserver
24 17
  

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)