Loading node/Dockerfile +4 −36 Original line number Diff line number Diff line Loading @@ -2,18 +2,13 @@ # Supervisor # Also includes common, non-site specific ESGF env variables (ESGF_HOME). FROM centos:6 ARG ESGF_IMAGES_HUB=esgfhub ARG ESGF_VERSION=devel FROM $ESGF_IMAGES_HUB/esgf-minimal-node:$ESGF_VERSION MAINTAINER Earth System Grid Federation <esgf-devel@lists.llnl.gov> # install GPG keys RUN rpm --import http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6 RUN rpm --import http://vault.centos.org/RPM-GPG-KEY-CentOS-6 RUN yum history new # That fix the warning 'Warning: RPMDB altered outside of yum' # install dependencies with yum RUN yum -y update && \ yum groupinstall -y development && \ RUN yum groupinstall -y development && \ yum install -y \ yum-utils \ bzip2-devel \ Loading @@ -34,9 +29,6 @@ RUN yum -y update && \ libjpeg-turbo-devel \ yum clean all # install additional epel repository RUN yum -y install epel-release; yum clean all # install Oracle Java 8 # see download string at: http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html # run scripts/get_oracle_jdk_linux_x64.sh to identify the correct URL Loading Loading @@ -92,30 +84,6 @@ COPY conf/supervisord.conf /etc/supervisord.conf COPY conf/supervisord_noothers.conf /etc/supervisord_noothers.conf RUN mkdir -p /etc/supervisor/conf.d/ # necessary to locate /esg/config/esgf.properties ### ARGS ARG ESGF_REPO='http://distrib-coffee.ipsl.jussieu.fr/pub/esgf' ### Common ESGF environment variables ENV ESGF_HOME='/esg' ENV ESGF_REPO=$ESGF_REPO ENV ESGF_BACKUP_DIR="$ESGF_HOME/backups" ENV ESGF_LOG_DIR="$ESGF_HOME/log" ENV ESGF_TOOL_DIR="$ESGF_HOME/tools" ENV ESGF_CONFIG_DIR="$ESGF_HOME/config" ENV ESGF_CONTENT_DIR="$ESGF_HOME/content" ENV ESGF_DEFAULT_TEST_DATA_DIR="$ESGF_HOME/data/test" # common ESGF directories RUN mkdir -p "$ESGF_LOG_DIR" RUN mkdir -p "$ESGF_TOOL_DIR" RUN mkdir -p "$ESGF_CONFIG_DIR" RUN mkdir -p "$ESGF_BACKUP_DIR" RUN mkdir -p "$ESGF_CONTENT_DIR" # default command starts supervisor in non-daemon mode # to be overridden by child images # NOTE: do not use ENTRYPOINT as it would interfere with arguments to certificate generation Loading Loading
node/Dockerfile +4 −36 Original line number Diff line number Diff line Loading @@ -2,18 +2,13 @@ # Supervisor # Also includes common, non-site specific ESGF env variables (ESGF_HOME). FROM centos:6 ARG ESGF_IMAGES_HUB=esgfhub ARG ESGF_VERSION=devel FROM $ESGF_IMAGES_HUB/esgf-minimal-node:$ESGF_VERSION MAINTAINER Earth System Grid Federation <esgf-devel@lists.llnl.gov> # install GPG keys RUN rpm --import http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6 RUN rpm --import http://vault.centos.org/RPM-GPG-KEY-CentOS-6 RUN yum history new # That fix the warning 'Warning: RPMDB altered outside of yum' # install dependencies with yum RUN yum -y update && \ yum groupinstall -y development && \ RUN yum groupinstall -y development && \ yum install -y \ yum-utils \ bzip2-devel \ Loading @@ -34,9 +29,6 @@ RUN yum -y update && \ libjpeg-turbo-devel \ yum clean all # install additional epel repository RUN yum -y install epel-release; yum clean all # install Oracle Java 8 # see download string at: http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html # run scripts/get_oracle_jdk_linux_x64.sh to identify the correct URL Loading Loading @@ -92,30 +84,6 @@ COPY conf/supervisord.conf /etc/supervisord.conf COPY conf/supervisord_noothers.conf /etc/supervisord_noothers.conf RUN mkdir -p /etc/supervisor/conf.d/ # necessary to locate /esg/config/esgf.properties ### ARGS ARG ESGF_REPO='http://distrib-coffee.ipsl.jussieu.fr/pub/esgf' ### Common ESGF environment variables ENV ESGF_HOME='/esg' ENV ESGF_REPO=$ESGF_REPO ENV ESGF_BACKUP_DIR="$ESGF_HOME/backups" ENV ESGF_LOG_DIR="$ESGF_HOME/log" ENV ESGF_TOOL_DIR="$ESGF_HOME/tools" ENV ESGF_CONFIG_DIR="$ESGF_HOME/config" ENV ESGF_CONTENT_DIR="$ESGF_HOME/content" ENV ESGF_DEFAULT_TEST_DATA_DIR="$ESGF_HOME/data/test" # common ESGF directories RUN mkdir -p "$ESGF_LOG_DIR" RUN mkdir -p "$ESGF_TOOL_DIR" RUN mkdir -p "$ESGF_CONFIG_DIR" RUN mkdir -p "$ESGF_BACKUP_DIR" RUN mkdir -p "$ESGF_CONTENT_DIR" # default command starts supervisor in non-daemon mode # to be overridden by child images # NOTE: do not use ENTRYPOINT as it would interfere with arguments to certificate generation Loading