Skip to content

Commit

Permalink
style(container): add missing license informations and sources for co…
Browse files Browse the repository at this point in the history
…ntainer scripts. #5292
  • Loading branch information
poikilotherm committed Jun 11, 2021
1 parent e9f691e commit d78e463
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 6 deletions.
18 changes: 14 additions & 4 deletions conf/container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,21 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
# http://www.apache.org/licenses/LICENSE-2.0

#
################################################################################################################
#
# THIS FILE IS TO BE USED WITH MAVEN DOCKER BUILD:
# mvn -Pcontainer clean package docker:build

# Using same base image as Solr (https://hub.docker.com/_/solr), reducing pulls
# mvn -Pct clean package docker:build
#
################################################################################################################
#
# Some commands used are inspired by https://github.com/payara/Payara/tree/master/appserver/extras/docker-images.
# Most parts origin from older versions of https://github.com/gdcc/dataverse-kubernetes.
#
# We are not using upstream Payara images because:
# - Using same base image as Solr (https://hub.docker.com/_/solr) is reducing pulls
# - Their image is less optimised for production usage by design choices
#
FROM openjdk:11-jre
LABEL maintainer="FDM FZJ <forschungsdaten@fz-juelich.de>"
# Default payara ports to expose
Expand Down
6 changes: 6 additions & 0 deletions conf/container/scripts/system/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
#!/bin/bash
##########################################################################################################
#
# This script is a fork of https://github.com/payara/Payara/blob/master/appserver/extras/docker-images/
# server-full/src/main/docker/bin/entrypoint.sh and licensed under CDDL 1.1 by the Payara Foundation.
#
##########################################################################################################

for f in ${SCRIPT_DIR}/init_* ${SCRIPT_DIR}/init.d/*; do
case "$f" in
Expand Down
11 changes: 9 additions & 2 deletions conf/container/scripts/system/init_1_generate_deploy_commands.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
################################################################################
##########################################################################################################
#
# A script to append deploy commands to the post boot command file at
# $PAYARA_HOME/scripts/post-boot-commands.asadmin file. All applications in the
Expand All @@ -22,7 +22,14 @@
#
# Note that many parameters to the deploy command can be safely used only when
# a single application exists in the $DEPLOY_DIR directory.
################################################################################
#
##########################################################################################################
#
# This script is a fork of https://github.com/payara/Payara/blob/master/appserver/extras/docker-images/
# server-full/src/main/docker/bin/init_1_generate_deploy_commands.sh and licensed under CDDL 1.1
# by the Payara Foundation.
#
##########################################################################################################

# Check required variables are set
if [ -z $DEPLOY_DIR ]; then echo "Variable DEPLOY_DIR is not set."; exit 1; fi
Expand Down
6 changes: 6 additions & 0 deletions conf/container/scripts/system/startInForeground.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@
# This script executes the asadmin tool which is expected at ~/appserver/bin/asadmin.
#
##########################################################################################################
#
# This script is a fork of https://github.com/payara/Payara/blob/master/appserver/
# extras/docker-images/server-full/src/main/docker/bin/startInForeground.sh and licensed under CDDL 1.1
# by the Payara Foundation.
#
##########################################################################################################

# Check required variables are set
if [ -z $ADMIN_USER ]; then echo "Variable ADMIN_USER is not set."; exit 1; fi
Expand Down

0 comments on commit d78e463

Please sign in to comment.