Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: docker/grouper
base: main
Choose a base ref
...
head repository: docker/grouper
compare: 2.5.12
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
1 contributor

Commits on Feb 11, 2020

  1. Update Dockerfile

    @chubing
    chubing committed Feb 11, 2020
    Copy the full SHA
    b85cda4 View commit details

  2. Update grouper.installer.properties

    @chubing
    chubing committed Feb 11, 2020
    Copy the full SHA
    e971290 View commit details

  3. Update grouper.installer.properties

    @chubing
    chubing committed Feb 11, 2020
    Copy the full SHA
    a57566b View commit details

  4. Update Dockerfile

    @chubing
    chubing committed Feb 11, 2020
    Copy the full SHA
    5e1d061 View commit details

  5. Update grouper.installer.properties

    @chubing
    chubing committed Feb 11, 2020
    Copy the full SHA
    9c457e5 View commit details

Commits on Feb 13, 2020

  1. Update grouper.installer.properties

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    95cce47 View commit details

  2. Update Dockerfile

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    06f7782 View commit details

  3. Update grouper.installer.properties

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    88a1da5 View commit details

  4. Delete web.xml

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    bde3787 View commit details

  5. Update grouper-www.conf

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    1ace64a View commit details

  6. Delete grouper-ws-scim.xml

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    8c979d5 View commit details

  7. Delete grouper-ws.xml

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    f098964 View commit details

  8. Update grouper.xml

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    142820e View commit details

  9. Update library.sh

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    c96c12b View commit details

  10. Update Dockerfile

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    c39255a View commit details

  11. Update Dockerfile

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    4068359 View commit details

  12. Update Dockerfile

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    166e61f View commit details

  13. Update Dockerfile

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    8aa7b99 View commit details

  14. have to refactor test-compose tests

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    30d275b View commit details

  15. update WORKDIR to new grouper home

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    d3c6758 View commit details

  16. enabling tests

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    dbc87bb View commit details

  17. Update Dockerfile

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    6eefaba View commit details

  18. Update Dockerfile

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    e393bd0 View commit details

  19. Update Jenkinsfile

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    ffbcefe View commit details

  20. fix grouper_home

    @chubing
    chubing committed Feb 13, 2020
    Copy the full SHA
    331a1c7 View commit details

Commits on Feb 16, 2020

  1. Update Dockerfile

    @chubing
    chubing committed Feb 16, 2020
    Copy the full SHA
    8e489c3 View commit details

Commits on Feb 17, 2020

  1. Update Dockerfile

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    e4da113 View commit details

  2. Update Dockerfile

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    f0ba413 View commit details

  3. Update Dockerfile

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    d129666 View commit details

  4. Update Dockerfile

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    620c33d View commit details

  5. Update Dockerfile

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    b9814f6 View commit details

  6. Update Dockerfile

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    ee1285a View commit details

  7. Update Dockerfile

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    ab16d9a View commit details

  8. Update Dockerfile

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    4b7ce76 View commit details

  9. update GROUPER_HOME

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    5f68f61 View commit details

  10. correto java jvm

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    b54716d View commit details

  11. Create corretto-signing-key.pub

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    46905d0 View commit details

  12. Update Dockerfile

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    ed705f6 View commit details

  13. Update main.bats

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    bb0e780 View commit details

  14. Update library.sh

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    72f3e6f View commit details

  15. Update main.bats

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    63d42f8 View commit details

  16. Create morphString.properties

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    a96ab7f View commit details

  17. Update docker-compose.yml

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    719997c View commit details

  18. Update docker-compose.yml

    @chubing
    chubing committed Feb 17, 2020
    Copy the full SHA
    bbf2b4e View commit details

Commits on Feb 18, 2020

  1. updates for 2.5

    @chubing
    chubing committed Feb 18, 2020
    Copy the full SHA
    55d16d2 View commit details

  2. Update main.bats

    @chubing
    chubing committed Feb 18, 2020
    Copy the full SHA
    4cd026c View commit details

  3. remove other JVM references

    @chubing
    chubing committed Feb 18, 2020
    Copy the full SHA
    778c111 View commit details

  4. Update Jenkinsfile

    @chubing
    chubing committed Feb 18, 2020
    Copy the full SHA
    d4f0011 View commit details

  5. Update supervisord-tomee.conf

    @chubing
    chubing committed Feb 18, 2020
    Copy the full SHA
    8920eb3 View commit details

Commits on Feb 20, 2020

  1. Update README.md

    @chubing
    chubing committed Feb 20, 2020
    Copy the full SHA
    611456d View commit details
137 changes: 37 additions & 100 deletions Dockerfile
View file
@@ -1,154 +1,91 @@
FROM centos:centos7 as installing

RUN yum update -y \
&& yum install -y wget tar unzip dos2unix \
&& yum clean all

RUN yum install -y wget tar unzip dos2unix

ARG GROUPER_CONTAINER_VERSION

ENV GROUPER_VERSION=2.4.0 \
JAVA_HOME=/usr/lib/jvm/zulu-8/ \
ENV GROUPER_VERSION=2.5.12 \
GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION

# use Zulu package
RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \
&& curl -o /etc/yum.repos.d/zulu.repo http://repos.azulsystems.com/rhel/zulu.repo \
&& yum -y install zulu-8

#RUN java_version=8.0.172; \
# zulu_version=8.30.0.1; \
# echo 'Downloading the OpenJDK Zulu...' \
# && wget -q http://cdn.azul.com/zulu/bin/zulu$zulu_version-jdk$java_version-linux_x64.tar.gz \
# && echo "0a101a592a177c1c7bc63738d7bc2930 zulu$zulu_version-jdk$java_version-linux_x64.tar.gz" | md5sum -c - \
# && tar -zxvf zulu$zulu_version-jdk$java_version-linux_x64.tar.gz -C /opt \
# && ln -s /opt/zulu$zulu_version-jdk$java_version-linux_x64 $JAVA_HOME

#RUN java_version=8u151; \
# java_bnumber=12; \
# java_semver=1.8.0_151; \
# java_hash=123b1d755416aa7579abc03f01ab946e612e141b6f7564130f2ada00ed913f1d; \
# echo 'Downloading the Oracle Java...' \
# && wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" \
# http://download.oracle.com/otn-pub/java/jdk/$java_version-b$java_bnumber/e758a0de34e24606bca991d704f6dcbf/server-jre-$java_version-linux-x64.tar.gz \
# && echo "$java_hash server-jre-$java_version-linux-x64.tar.gz" | sha256sum -c - \
# && tar -zxvf server-jre-$java_version-linux-x64.tar.gz -C /opt \
# && ln -s /opt/jdk$java_semver/ $JAVA_HOME
# Install Corretto Java JDK
#Corretto download page: https://docs.aws.amazon.com/corretto/latest/corretto-8-ug/downloads-list.html
ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-8-x64-linux-jdk.rpm
ARG CORRETTO_RPM=amazon-corretto-8-x64-linux-jdk.rpm
COPY container_files/java-corretto/corretto-signing-key.pub .
RUN curl -O -L $CORRETTO_URL_PERM \
&& rpm --import corretto-signing-key.pub \
&& rpm -K $CORRETTO_RPM \
&& rpm -i $CORRETTO_RPM \
&& rm -r corretto-signing-key.pub $CORRETTO_RPM
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto

RUN echo 'Downloading Grouper Installer...' \
&& mkdir -p /opt/grouper/$GROUPER_VERSION \
&& wget -q -O /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar http://software.internet2.edu/grouper/release/$GROUPER_VERSION/grouperInstaller.jar

&& wget -q -O /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar https://oss.sonatype.org/service/local/repositories/releases/content/edu/internet2/middleware/grouper/grouper-installer/$GROUPER_VERSION/grouper-installer-$GROUPER_VERSION.jar
COPY container_files/grouper.installer.properties /opt/grouper/$GROUPER_VERSION
# Temporary morphString file used for building, not used in production
COPY container_files/morphString.properties /opt/grouper/$GROUPER_VERSION


RUN echo 'Installing Grouper'; \
PATH=$PATH:$JAVA_HOME/bin; \
cd /opt/grouper/$GROUPER_VERSION/ \
&& $JAVA_HOME/bin/java -cp :grouperInstaller.jar edu.internet2.middleware.grouperInstaller.GrouperInstaller



FROM centos:centos7 as cleanup

ENV GROUPER_VERSION=2.4.0 \
TOMCAT_VERSION=8.5.42 \
ENV GROUPER_VERSION=2.5.12 \
TOMEE_VERSION=7.0.0

RUN mkdir -p /opt/grouper/grouperWebapp/
RUN mkdir -p /opt/tomee/
COPY --from=installing /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar /opt/grouper/
COPY --from=installing /opt/grouper/$GROUPER_VERSION/grouper.apiBinary-$GROUPER_VERSION/ /opt/grouper/grouper.apiBinary/
COPY --from=installing /opt/grouper/$GROUPER_VERSION/grouper.ui-$GROUPER_VERSION/dist/grouper/ /opt/grouper/grouper.ui/
COPY --from=installing /opt/grouper/$GROUPER_VERSION/grouper.ws-$GROUPER_VERSION/grouper-ws/build/dist/grouper-ws/ /opt/grouper/grouper.ws/
COPY --from=installing /opt/grouper/$GROUPER_VERSION/grouper.ws-$GROUPER_VERSION/grouper-ws-scim/targetBuiltin/grouper-ws-scim/ /opt/grouper/grouper.scim/
#COPY --from=installing /opt/grouper/$GROUPER_VERSION/grouper.clientBinary-$GROUPER_VERSION/ /opt/grouper/grouper.clientBinary/
COPY --from=installing /opt/grouper/$GROUPER_VERSION/apache-tomcat-$TOMCAT_VERSION/ /opt/tomcat/
COPY --from=installing /opt/grouper/$GROUPER_VERSION/apache-tomee-webprofile-$TOMEE_VERSION/ /opt/tomee/
COPY --from=installing /opt/grouper/$GROUPER_VERSION/container/tomee/ /opt/tomee/
COPY --from=installing /opt/grouper/$GROUPER_VERSION/container/webapp/ /opt/grouper/grouperWebapp/
RUN ls /opt/grouper/grouperWebapp/
COPY --from=installing /etc/alternatives/java /etc/alternatives/java

ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/log4j-core-2.11.0.jar /opt/tomcat/bin
ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /opt/tomcat/bin
ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.11.0/log4j-jul-2.11.0.jar /opt/tomcat/bin

ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/log4j-core-2.11.0.jar /opt/tomee/bin
ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /opt/tomee/bin
ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.11.0/log4j-jul-2.11.0.jar /opt/tomee/bin

RUN cd /opt/grouper/grouper.apiBinary/; \
rm -fr ddlScripts/ grouper.properties grouper.lck grouper.log grouper.script grouper.tmp/ gshAddGrouperSystemWsGroup.gsh logs/

RUN cd /opt/tomcat/; \
chmod +r bin/log4j-*.jar; \
rm -fr webapps/docs/ webapps/examples/ webapps/host-manager/ webapps/manager/ webapps/ROOT/ logs/* temp/* work/* conf/logging.properties

RUN ls /opt/grouper/
RUN ls /opt/grouper/grouperWebapp/WEB-INF
#ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/log4j-core-2.11.0.jar /opt/tomee/bin
#ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /opt/tomee/bin
#ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.11.0/log4j-jul-2.11.0.jar /opt/tomee/bin
RUN cd /opt/tomee/; \
chmod +r bin/log4j-*.jar; \
rm -fr webapps/docs/ webapps/host-manager/ webapps/manager/ logs/* temp/* work/* conf/logging.properties

COPY container_files/api/* /opt/grouper/grouper.apiBinary/conf/
COPY container_files/ui/ /opt/grouper/grouper.ui/WEB-INF/
COPY container_files/ws/ /opt/grouper/grouper.ws/WEB-INF/
COPY container_files/tomcat/ /opt/tomcat/
COPY container_files/api/* /opt/grouper/grouperWebapp/WEB-INF/classes/
COPY container_files/ui/ /opt/grouper/grouperWebapp/WEB-INF/classes/
COPY container_files/tomee/ /opt/tomee/


FROM tier/shibboleth_sp:3.0.4_03122019

LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
Vendor="TIER" \
ImageType="Grouper" \
ImageName=$imagename \
ImageOS=centos7

ARG GROUPER_CONTAINER_VERSION

ENV JAVA_HOME=/usr/lib/jvm/zulu-8/ \
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto \
PATH=$PATH:$JAVA_HOME/bin \
GROUPER_HOME=/opt/grouper/grouper.apiBinary \
GROUPER_HOME=/opt/grouper/grouperWebapp/WEB-INF \
GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION

RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime

RUN yum update -y \
&& yum install -y cron logrotate python-pip \
&& yum install -y cron logrotate python-pip rsync \
&& pip install --upgrade pip \
&& pip install supervisor \
&& yum clean -y all

COPY --from=installing $JAVA_HOME $JAVA_HOME
COPY --from=cleanup /opt/tomcat/ /opt/tomcat/
COPY --from=cleanup /opt/tomee/ /opt/tomee/
COPY --from=cleanup /opt/grouper/ /opt/grouper/

RUN groupadd -r tomcat \
&& useradd -r -m -s /sbin/nologin -g tomcat tomcat \
&& mkdir -p /opt/tomcat/logs/ /opt/tomcat/temp/ /opt/tomcat/work/ \
&& chown -R tomcat:tomcat /opt/tomcat/logs/ /opt/tomcat/temp/ /opt/tomcat/work/ \
&& chown -R tomcat:tomcat /opt/tomee/logs/ /opt/tomee/temp/ /opt/tomee/work/ \
&& ln -s $JAVA_HOME/bin/java /etc/alternatives/java

# does shib sp3 not generate these files?
# RUN rm /etc/shibboleth/sp-key.pem /etc/shibboleth/sp-cert.pem
&& chown -R tomcat:tomcat /opt/tomee \
&& ln -s $JAVA_HOME/bin/java /etc/alternatives/java \
&& mkdir -p /opt/tomee/conf/Catalina/localhost/

COPY container_files/tier-support/ /opt/tier-support/
COPY container_files/usr-local-bin/ /usr/local/bin/
COPY container_files/httpd/* /etc/httpd/conf.d/
COPY container_files/shibboleth/* /etc/shibboleth/
RUN cp /dev/null /etc/httpd/conf.d/ssl.conf

RUN cp /dev/null /etc/httpd/conf.d/ssl.conf \
&& sed -i 's/LogFormat "/LogFormat "httpd;access_log;%{ENV}e;%{USERTOKEN}e;/g' /etc/httpd/conf/httpd.conf \
&& echo -e "\nErrorLogFormat \"httpd;error_log;%{ENV}e;%{USERTOKEN}e;[%{u}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i\"" >> /etc/httpd/conf/httpd.conf \
&& sed -i 's/CustomLog "logs\/access_log"/CustomLog "\/tmp\/logpipe"/g' /etc/httpd/conf/httpd.conf \
&& sed -i 's/ErrorLog "logs\/error_log"/ErrorLog "\/tmp\/logpipe"/g' /etc/httpd/conf/httpd.conf \
&& echo -e "\nPassEnv ENV" >> /etc/httpd/conf/httpd.conf \
&& echo -e "\nPassEnv USERTOKEN" >> /etc/httpd/conf/httpd.conf

WORKDIR /opt/grouper/grouper.apiBinary/

WORKDIR /opt/grouper/grouperWebapp/WEB-INF/
EXPOSE 80 443

HEALTHCHECK NONE

ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

CMD ["bin/gsh", "-loader"]
CMD ["bin/gsh.sh", "-loader"]
24 changes: 6 additions & 18 deletions Jenkinsfile
View file
@@ -51,12 +51,13 @@ pipeline {
steps {
script {
try{
docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
// statically defining jenkins credential value dockerhub-tier
docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-tier") {
baseImg = docker.build("$maintainer/$imagename", "--build-arg GROUPER_CONTAINER_VERSION=$tag --no-cache .")
}
} catch(error) {
def error_details = readFile('./debug');
def message = "BUILD ERROR: There was a problem building ${imagename}:${tag}. \n\n ${error_details}"
def message = "BUILD ERROR: There was a problem building ${maintainer}/${imagename}:${tag}. \n\n ${error_details}"
sh "rm -f ./debug"
handleError(message)
}
@@ -70,7 +71,7 @@ pipeline {
sh 'bin/test.sh 2>&1 | tee debug ; test ${PIPESTATUS[0]} -eq 0'
} catch (error) {
def error_details = readFile('./debug')
def message = "BUILD ERROR: There was a problem testing ${imagename}:${tag}. \n\n ${error_details}"
def message = "BUILD ERROR: There was a problem testing ${maintainer}/${imagename}:${tag}. \n\n ${error_details}"
sh "rm -f ./debug"
handleError(message)
}
@@ -81,21 +82,8 @@ pipeline {
stage('Push') {
steps {
script {
//// scan the image with clair
// sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:latest'
// sh 'docker run -p 6060:6060 --link clairdb:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
// sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
// sh 'chmod 755 clair-scanner'
// sh "./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename:latest"
//// test the environment
// sh 'docker kill clairdb'
// sh 'docker rm clairdb'
// sh 'docker kill clair'
// sh 'docker rm clair'
// sh 'cd test-compose && ./compose.sh'
//// bring down after testing
//sh 'cd test-compose && docker-compose down'
docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
// statically defining jenkins credential value dockerhub-tier
docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-tier") {
baseImg.push("$tag")
}
}