From 954e3af4370e77b3cb974cc633b01598b4bd96e7 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 11 Jun 2021 15:25:41 +0200 Subject: [PATCH] style(container): add missing license informations and sources for container scripts. #5292 --- conf/container/Dockerfile | 18 ++++++++++++++---- conf/container/scripts/system/entrypoint.sh | 6 ++++++ .../system/init_1_generate_deploy_commands.sh | 11 +++++++++-- .../scripts/system/startInForeground.sh | 6 ++++++ 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/conf/container/Dockerfile b/conf/container/Dockerfile index fd6e019b2e0..e3d7bb4fb9a 100644 --- a/conf/container/Dockerfile +++ b/conf/container/Dockerfile @@ -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 " # Default payara ports to expose diff --git a/conf/container/scripts/system/entrypoint.sh b/conf/container/scripts/system/entrypoint.sh index 438f177a11b..ed656e41093 100644 --- a/conf/container/scripts/system/entrypoint.sh +++ b/conf/container/scripts/system/entrypoint.sh @@ -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 diff --git a/conf/container/scripts/system/init_1_generate_deploy_commands.sh b/conf/container/scripts/system/init_1_generate_deploy_commands.sh index 234196ee246..e2f0730d40f 100644 --- a/conf/container/scripts/system/init_1_generate_deploy_commands.sh +++ b/conf/container/scripts/system/init_1_generate_deploy_commands.sh @@ -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 @@ -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 diff --git a/conf/container/scripts/system/startInForeground.sh b/conf/container/scripts/system/startInForeground.sh index f2b82ee2020..4f22825202c 100644 --- a/conf/container/scripts/system/startInForeground.sh +++ b/conf/container/scripts/system/startInForeground.sh @@ -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