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: appliance
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 2, 2018

  1. Update Dockerfile

    @chubing
    chubing committed Apr 2, 2018
    Copy the full SHA
    9aaf026 View commit details

Commits on Apr 3, 2018

  1. Update Dockerfile

    @chubing
    chubing committed Apr 3, 2018
    Copy the full SHA
    e413824 View commit details

Commits on Apr 4, 2018

  1. Update README.md

    @chubing
    chubing committed Apr 4, 2018
    Copy the full SHA
    34c462f View commit details

  2. Update README.md

    @chubing
    chubing committed Apr 4, 2018
    Copy the full SHA
    0e19d0c View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 Dockerfile
  2. +2 −2 README.md
4 changes: 2 additions & 2 deletions Dockerfile
View file
@@ -4,7 +4,7 @@ FROM tier/shibboleth_sp
ARG maintainer=tier
ARG imagename=grouper
ARG version=2.3.0
ARG tierversion=17070
ARG tierversion=180401

MAINTAINER $maintainer
LABEL Vendor="Internet2"
@@ -18,7 +18,7 @@ ENV TIERVERSION=$tierversion
ENV IMAGENAME=$imagename
ENV MAINTAINER=$maintainer

ENV TOMCAT_VERSION="8.5.12"
ENV TOMCAT_VERSION="8.5.29"
ENV WAIT_TIME=60

LABEL Build docker build --rm --tag $maintainer/$imagename .
4 changes: 2 additions & 2 deletions README.md
View file
@@ -1,5 +1,5 @@
# Grouper

[![Build Status](https://jenkins.testbed.tier.internet2.edu/job/docker/job/grouper/job/master/badge/icon)](https://jenkins.testbed.tier.internet2.edu/job/docker/job/grouper/job/master/)
[![Build Status](https://jenkins.testbed.tier.internet2.edu/job/docker/job/grouper/job/appliance/badge/icon)](https://jenkins.testbed.tier.internet2.edu/job/docker/job/grouper/job/appliance/)

Produces the container image for Grouper
Produces the container image for Grouper Virtual Machine. For the Native Docker Grouper image, go to the master branch of this repo.