-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #209 from GlobalDataverseCommunityConsortium/develop
Release v4.20
- Loading branch information
Showing
101 changed files
with
2,077 additions
and
394 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
--- | ||
version: '3.5' | ||
services: | ||
|
||
postgresql: | ||
image: postgres:9.6 | ||
expose: | ||
- 5432 | ||
environment: | ||
- POSTGRES_USER=dataverse | ||
- POSTGRES_PASSWORD=changeme | ||
|
||
solr: | ||
image: iqss/solr-k8s | ||
expose: | ||
- 8983 | ||
|
||
dataverse: | ||
build: | ||
context: . | ||
dockerfile: ./docker/dataverse-k8s/glassfish-dev/Dockerfile | ||
image: iqss/dataverse-k8s:dev | ||
depends_on: | ||
- postgresql | ||
- solr | ||
ports: | ||
- 8080:8080 | ||
volumes: | ||
- type: bind | ||
source: ./personas/docker-compose/secrets | ||
target: /secrets | ||
read_only: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,8 @@ DATAVERSE_URL=${DATAVERSE_URL:-"http://${DATAVERSE_SERVICE_HOST}:${DATAVERSE_SER | |
# The Solr Service IP is always available under its name within the same namespace. | ||
# If people want to use a different Solr than we normally deploy, they have the | ||
# option to override. | ||
SOLR_K8S_HOST=${SOLR_K8S_HOST:-"solr"} | ||
SOLR_SERVICE_HOST=${SOLR_SERVICE_HOST:-"solr"} | ||
SOLR_SERVICE_PORT=${SOLR_SERVICE_PORT:-"8983"} | ||
|
||
# Check postgres and API key secrets are available | ||
if [ ! -s "${SECRETS_DIR}/db/password" ]; then | ||
|
@@ -53,7 +54,7 @@ sed -i -e "s#[email protected]#${CONTACT_MAIL}#" data/user-admin.json | |
./setup-all.sh --insecure -p="${ADMIN_PASSWORD:-admin}" | ||
|
||
# 4.) Configure Solr location | ||
curl -sS -X PUT -d "${SOLR_K8S_HOST}:8983" "${DATAVERSE_URL}/api/admin/settings/:SolrHostColonPort" | ||
curl -sS -X PUT -d "${SOLR_SERVICE_HOST}:${SOLR_SERVICE_PORT}" "${DATAVERSE_URL}/api/admin/settings/:SolrHostColonPort" | ||
|
||
# 5.) Provision builtin users key to enable creation of more builtin users | ||
if [ -s "${SECRETS_DIR}/api/userskey" ]; then | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,9 +8,9 @@ FROM centos:7 | |
|
||
LABEL maintainer="FDM FZJ <[email protected]>" | ||
|
||
ARG TINI_VERSION=v0.18.0 | ||
ARG TINI_VERSION=v0.19.0 | ||
ARG JMX_EXPORTER_VERSION=0.12.0 | ||
ARG VERSION=4.19 | ||
ARG VERSION=4.20 | ||
ARG DOMAIN=domain1 | ||
|
||
ENV HOME_DIR=/opt/dataverse\ | ||
|
@@ -21,11 +21,12 @@ ENV HOME_DIR=/opt/dataverse\ | |
DOCROOT_DIR=/docroot\ | ||
METADATA_DIR=/metadata\ | ||
SECRETS_DIR=/secrets\ | ||
DUMPS_DIR=/dumps\ | ||
GLASSFISH_PKG=http://download.java.net/glassfish/4.1/release/glassfish-4.1.zip\ | ||
GLASSFISH_SHA1=704a90899ec5e3b5007d310b13a6001575827293\ | ||
WELD_PKG=https://repo1.maven.org/maven2/org/jboss/weld/weld-osgi-bundle/2.2.10.SP1/weld-osgi-bundle-2.2.10.SP1-glassfish4.jar\ | ||
GRIZZLY_PKG=http://guides.dataverse.org/en/latest/_downloads/glassfish-grizzly-extra-all.jar\ | ||
PGDRIVER_PKG=https://jdbc.postgresql.org/download/postgresql-42.2.10.jar\ | ||
GRIZZLY_PKG=http://guides.dataverse.org/en/${VERSION}/_downloads/glassfish-grizzly-extra-all.jar\ | ||
PGDRIVER_PKG=https://jdbc.postgresql.org/download/postgresql-42.2.12.jar\ | ||
DATAVERSE_VERSION=${VERSION}\ | ||
DATAVERSE_PKG=https://github.com/IQSS/dataverse/releases/download/v${VERSION}/dvinstall.zip\ | ||
JMX_EXPORTER_PKG=https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/${JMX_EXPORTER_VERSION}/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar\ | ||
|
@@ -43,15 +44,13 @@ RUN groupadd -g 1000 glassfish && \ | |
useradd -u 1000 -M -s /bin/bash -d ${HOME_DIR} glassfish -g glassfish && \ | ||
echo glassfish:glassfish | chpasswd && \ | ||
mkdir -p ${HOME_DIR} ${SCRIPT_DIR} ${SECRETS_DIR} && \ | ||
mkdir -p ${DATA_DIR} ${METADATA_DIR} ${DOCROOT_DIR} && \ | ||
chown -R glassfish: ${HOME_DIR} ${DATA_DIR} ${METADATA_DIR} ${DOCROOT_DIR} | ||
mkdir -p ${DATA_DIR} ${METADATA_DIR} ${DOCROOT_DIR} ${DUMPS_DIR} && \ | ||
chown -R glassfish: ${HOME_DIR} ${DATA_DIR} ${METADATA_DIR} ${DOCROOT_DIR} ${DUMPS_DIR} | ||
|
||
# Install tini as minimized init system | ||
RUN wget --no-verbose -O /tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini && \ | ||
wget --no-verbose -O /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc && \ | ||
gpg --batch --keyserver "hkp://p80.pool.sks-keyservers.net:80" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \ | ||
gpg --batch --verify /tini.asc /tini && \ | ||
chmod +x /tini | ||
RUN wget --no-verbose -O tini-amd64 https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-amd64 && \ | ||
echo '93dcc18adc78c65a028a84799ecf8ad40c936fdfc5f2a57b1acda5a8117fa82c tini-amd64' | sha256sum -c - && \ | ||
mv tini-amd64 /tini && chmod +x /tini | ||
|
||
# Install esh template engine from Github | ||
RUN wget --no-verbose -O esh https://raw.githubusercontent.com/jirutka/esh/v0.3.0/esh && \ | ||
|
@@ -94,6 +93,14 @@ RUN ${GLASSFISH_DIR}/bin/asadmin start-domain && \ | |
for MEMORY_JVM_OPTION in $(${GLASSFISH_DIR}/bin/asadmin list-jvm-options | grep "Xm[sx]"); do\ | ||
${GLASSFISH_DIR}/bin/asadmin delete-jvm-options $MEMORY_JVM_OPTION;\ | ||
done && \ | ||
${GLASSFISH_DIR}/bin/asadmin create-jvm-options -- "-XX\:+HeapDumpOnOutOfMemoryError" && \ | ||
${GLASSFISH_DIR}/bin/asadmin create-jvm-options -- "-XX\:HeapDumpPath=${DUMPS_DIR}" && \ | ||
${GLASSFISH_DIR}/bin/asadmin create-jvm-options -- "-XX\:+UseG1GC" && \ | ||
${GLASSFISH_DIR}/bin/asadmin create-jvm-options -- "-XX\:+UseStringDeduplication" && \ | ||
${GLASSFISH_DIR}/bin/asadmin create-jvm-options -- "-XX\:MaxGCPauseMillis=500" && \ | ||
${GLASSFISH_DIR}/bin/asadmin create-jvm-options -- "-XX\:MetaspaceSize=256m" && \ | ||
${GLASSFISH_DIR}/bin/asadmin create-jvm-options -- "-XX\:MaxMetaspaceSize=2g" && \ | ||
${GLASSFISH_DIR}/bin/asadmin create-jvm-options -- "-XX\:+IgnoreUnrecognizedVMOptions" && \ | ||
${GLASSFISH_DIR}/bin/asadmin create-jvm-options -- "-server" && \ | ||
${GLASSFISH_DIR}/bin/asadmin stop-domain && \ | ||
mkdir -p ${DOMAIN_DIR}/autodeploy && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,44 +4,33 @@ | |
# You may obtain a copy of the License at | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
FROM payara/server-full:5.201 | ||
FROM payara/server-full:5.2020.3 | ||
LABEL maintainer="FDM FZJ <[email protected]>" | ||
|
||
ARG VERSION=4.19 | ||
ARG VERSION=4.20 | ||
ARG DOMAIN=domain1 | ||
|
||
ENV DATA_DIR=/data\ | ||
DOCROOT_DIR=/docroot\ | ||
METADATA_DIR=/metadata\ | ||
SECRETS_DIR=/secrets\ | ||
DUMPS_DIR=/dumps\ | ||
DOMAIN_DIR=${PAYARA_DIR}/glassfish/domains/${DOMAIN_NAME}\ | ||
DATAVERSE_VERSION=${VERSION}\ | ||
DATAVERSE_PKG=https://github.com/IQSS/dataverse/releases/download/v${VERSION}/dvinstall.zip\ | ||
PGDRIVER_PKG=https://jdbc.postgresql.org/download/postgresql-42.2.12.jar\ | ||
MEM_MAX_RAM_PERCENTAGE=70.0\ | ||
MEM_XSS=512k | ||
# Make heap dumps on OOM appear in DUMPS_DIR | ||
JVM_ARGS="-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=\${ENV=DUMPS_DIR}" | ||
|
||
# Create basic pathes | ||
USER root | ||
RUN mkdir -p ${HOME_DIR} ${SCRIPT_DIR} ${SECRETS_DIR} && \ | ||
mkdir -p ${DATA_DIR} ${METADATA_DIR} ${DOCROOT_DIR} && \ | ||
chown -R payara: ${DATA_DIR} ${METADATA_DIR} ${DOCROOT_DIR} ${SECRETS_DIR} | ||
|
||
# WORKAROUND MEMORY ISSUES UNTIL UPSTREAM FIXES THEM IN NEW RELEASE | ||
RUN ${PAYARA_DIR}/bin/asadmin --user=${ADMIN_USER} --passwordfile=${PASSWORD_FILE} start-domain ${DOMAIN_NAME} && \ | ||
${PAYARA_DIR}/bin/asadmin --user=${ADMIN_USER} --passwordfile=${PASSWORD_FILE} delete-jvm-options \ | ||
'-XX\:+UnlockExperimentalVMOptions:-XX\:+UseCGroupMemoryLimitForHeap:-XX\:MaxRAMFraction=1' && \ | ||
${PAYARA_DIR}/bin/asadmin --user=${ADMIN_USER} --passwordfile=${PASSWORD_FILE} create-jvm-options \ | ||
'-XX\:+UseContainerSupport:-XX\:MaxRAMPercentage=${ENV=MEM_MAX_RAM_PERCENTAGE}:-Xss${ENV=MEM_XSS}' && \ | ||
${PAYARA_DIR}/bin/asadmin --user=${ADMIN_USER} --passwordfile=${PASSWORD_FILE} stop-domain ${DOMAIN_NAME} && \ | ||
# Cleanup after initialization | ||
rm -rf \ | ||
${PAYARA_DIR}/glassfish/domains/${DOMAIN_NAME}/osgi-cache \ | ||
${PAYARA_DIR}/glassfish/domains/${DOMAIN_NAME}/logs | ||
mkdir -p ${DATA_DIR} ${METADATA_DIR} ${DOCROOT_DIR} ${DUMPS_DIR} && \ | ||
chown -R payara: ${DATA_DIR} ${METADATA_DIR} ${DOCROOT_DIR} ${SECRETS_DIR} ${DUMPS_DIR} | ||
|
||
# Install prerequisites | ||
RUN apt-get -qq update && \ | ||
apt-get -qqy install postgresql-client jq imagemagick curl | ||
apt-get -qqy install postgresql-client jq imagemagick curl wget unzip | ||
|
||
# Install esh template engine from Github | ||
RUN wget --no-verbose -O esh https://raw.githubusercontent.com/jirutka/esh/v0.3.0/esh && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,7 @@ LABEL maintainer="FDM FZJ <[email protected]>" | |
|
||
ARG WEBHOOK_VERSION=2.6.11 | ||
ARG TINI_VERSION=v0.18.0 | ||
ARG VERSION=4.19 | ||
ARG VERSION=4.20 | ||
ARG COLLECTION=collection1 | ||
ENV SOLR_OPTS="-Dsolr.jetty.request.header.size=102400"\ | ||
COLLECTION_DIR=/opt/solr/server/solr/${COLLECTION}\ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
.build | ||
_build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.