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: 2.4.0-80-u51-w10-p11-20191118
Choose a base ref
...
head repository: docker/grouper
compare: main
Choose a head ref
Able to merge. These branches can be automatically merged.
1 contributor

Commits on Dec 9, 2019

  1. Merge pull request #82 from docker/2.4.0-80-u51-w10-p11-20191118 

    2.4.0 80 u51 w10 p11 20191118
    @chubing
    chubing committed Dec 9, 2019
    Copy the full SHA
    bd790bf View commit details

Commits on Dec 23, 2019

  1. 2.4.0-a85-u53-w10-p12-20191223-rc1

    @chubing
    chubing committed Dec 23, 2019
    Copy the full SHA
    f4b81f6 View commit details

Commits on Dec 24, 2019

  1. 2.4.0-a86-u53-w10-p12-20191224-rc1

    @chubing
    chubing committed Dec 24, 2019
    Copy the full SHA
    3509ca4 View commit details

Commits on Jan 3, 2020

  1. 2.4.0-a87-u53-w10-p12-20200102-rc1

    @chubing
    chubing committed Jan 3, 2020
    Copy the full SHA
    3058d5f View commit details

  2. 2.4.0-a87-u54-w10-p12-20200102-rc1

    @chubing
    chubing committed Jan 3, 2020
    Copy the full SHA
    7b7a12a View commit details

  3. Merge pull request #83 from docker/2.4.0-a87-u54-w10-p12-20200102-rc1 

    2.4.0 a87 u54 w10 p12 20200102 rc1
    @chubing
    chubing committed Jan 3, 2020
    Copy the full SHA
    d537def View commit details

  4. Update README.md

    @chubing
    chubing committed Jan 3, 2020
    Copy the full SHA
    a2a1cac View commit details

  5. typo in jenkins url

    @chubing
    chubing committed Jan 3, 2020
    Copy the full SHA
    3e8bd5c View commit details

Commits on Jan 9, 2020

  1. 2.4.0-a88-u55-w11-p12-20200109-rc1

    @chubing
    chubing committed Jan 9, 2020
    Copy the full SHA
    e6bd885 View commit details

  2. Update README.md

    @chubing
    chubing committed Jan 9, 2020
    Copy the full SHA
    ce4b1d4 View commit details

  3. temporary morphString.properties file for build

    @chubing
    chubing committed Jan 9, 2020
    Copy the full SHA
    82b97ac View commit details

  4. install temporary morphString.properties

    @chubing
    chubing committed Jan 9, 2020
    Copy the full SHA
    22847a5 View commit details

  5. Update Dockerfile

    @chubing
    chubing committed Jan 9, 2020
    Copy the full SHA
    9788217 View commit details

Commits on Jan 10, 2020

  1. update dummy encrypt.key

    @chubing
    chubing committed Jan 10, 2020
    Copy the full SHA
    bf865a5 View commit details

  2. 2.4.0-a89-u55-w11-p12-20200110-rc1

    @chubing
    chubing committed Jan 10, 2020
    Copy the full SHA
    70d9ca6 View commit details

Commits on Jan 13, 2020

  1. Merge branch 'master' into 2.4.0-a89-u55-w11-p12-20200110-rc1

    @chubing
    chubing committed Jan 13, 2020
    Copy the full SHA
    6f61be8 View commit details

  2. Merge pull request #84 from docker/2.4.0-a89-u55-w11-p12-20200110-rc1 

    2.4.0 a89 u55 w11 p12 20200110 rc1
    @chubing
    chubing committed Jan 13, 2020
    Copy the full SHA
    20d2cbd View commit details

Commits on Jan 31, 2020

  1. 2.4.0-a89-u55-w11-p12-20200131-rc1 

    remove extraneous grouper.properties in /opt/grouper/grouper.apiBinary/
    @chubing
    chubing committed Jan 31, 2020
    Copy the full SHA
    332ddf1 View commit details

  2. central.maven.org to repo1 for now

    @chubing
    chubing committed Jan 31, 2020
    Copy the full SHA
    9c045d4 View commit details

Commits on Feb 5, 2020

  1. 2.4.0-a90-u56-w11-p12-20200205-rc1

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

Commits on Feb 10, 2020

  1. 2.4.0-a91-u56-w11-p12-20200210-rc1

    @chubing
    chubing committed Feb 10, 2020
    Copy the full SHA
    3fc5711 View commit details

Commits on Feb 14, 2020

  1. Update grouper.installer.properties

    @chubing
    chubing committed Feb 14, 2020
    Copy the full SHA
    6f931f0 View commit details

Commits on Mar 5, 2020

  1. Merge pull request #86 from docker/2.4.0-a93-u56-w11-p12-20200214-rc1 

    2.4.0 a93 u56 w11 p12 20200214 rc1
    @chubing
    chubing committed Mar 5, 2020
    Copy the full SHA
    3ba862c View commit details
Showing with 15 additions and 10 deletions.
  1. +10 −7 Dockerfile
  2. +2 −1 README.md
  3. +2 −2 container_files/grouper.installer.properties
  4. +1 −0 container_files/morphString.properties
17 changes: 10 additions & 7 deletions Dockerfile
View file
@@ -39,6 +39,9 @@ RUN echo 'Downloading Grouper Installer...' \
&& wget -q -O /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar http://software.internet2.edu/grouper/release/$GROUPER_VERSION/grouperInstaller.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; \
@@ -63,16 +66,16 @@ COPY --from=installing /opt/grouper/$GROUPER_VERSION/apache-tomcat-$TOMCAT_VERSI
COPY --from=installing /opt/grouper/$GROUPER_VERSION/apache-tomee-webprofile-$TOMEE_VERSION/ /opt/tomee/
COPY --from=installing /etc/alternatives/java /etc/alternatives/java

ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/log4j-core-2.11.0.jar /opt/tomcat/bin
ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /opt/tomcat/bin
ADD http://central.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/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 http://central.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/log4j-core-2.11.0.jar /opt/tomee/bin
ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /opt/tomee/bin
ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.11.0/log4j-jul-2.11.0.jar /opt/tomee/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.lck grouper.log grouper.script grouper.tmp/ gshAddGrouperSystemWsGroup.gsh logs/
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; \
3 changes: 2 additions & 1 deletion README.md
View file
@@ -1,4 +1,5 @@
[![Build Status](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-80-u51-w10-p11-20191118)](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-80-u51-w10-p11-20191118)
[![Build Status](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/master)](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/master)



This repository contains the source code used to create the InCommon Trusted Access Platform Grouper container. This standalone container is pushed to Dockerhub, various tags are available at the following URL: https://hub.docker.com/r/tier/grouper/tags. This repo can also be cloned and the container built locally.
4 changes: 2 additions & 2 deletions container_files/grouper.installer.properties
View file
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
# 2.4.0-80-u51-w10-p11-20191031-rc1
grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_80,grouper_v2_4_0_ui_patch_51,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_11
# 2.4.0-a93-u56-w11-p12-20200214-rc1
grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_93,grouper_v2_4_0_ui_patch_56,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12


#### set this to true to try to use defaults for everything. Only things without default values will need to be set
1 change: 1 addition & 0 deletions container_files/morphString.properties
View file
@@ -0,0 +1 @@
encrypt.key=fh43IRJ4Nf5