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/shib-ui
base: 1.17.4
Choose a base ref
...
head repository: docker/shib-ui
compare: main
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 17 commits
  • 9 files changed
  • 2 contributors

Commits on Jul 18, 2023

  1. release 1.18.0

    @credman
    credman committed Jul 18, 2023
    Copy the full SHA
    b45f8c5 View commit details

  2. Remove unused old beacon code; hardcode tbTIERRelease value

    @credman
    credman committed Jul 18, 2023
    Loading status checks…
    Copy the full SHA
    c474297 View commit details

Commits on May 21, 2024

  1. release 2.0.0

    @sporth
    sporth committed May 21, 2024
    Loading status checks…
    Copy the full SHA
    d4a4250 View commit details

Commits on May 29, 2024

  1. release 2.0.0

    @sporth
    sporth committed May 29, 2024
    Loading status checks…
    Copy the full SHA
    a23d4e4 View commit details

Commits on Aug 1, 2024

  1. release 2.0.1

    @sporth
    sporth committed Aug 1, 2024
    Loading status checks…
    Copy the full SHA
    00924ac View commit details

  2. release 2.0.1

    @sporth
    sporth committed Aug 1, 2024
    Copy the full SHA
    62d4ef6 View commit details

Commits on Oct 22, 2024

  1. release 2.0.4

    @sporth
    sporth committed Oct 22, 2024
    Copy the full SHA
    d4117d3 View commit details

  2. release 2.0.4

    @sporth
    sporth committed Oct 22, 2024
    Copy the full SHA
    5e6354e View commit details

  3. release 2.0.4

    @sporth
    sporth committed Oct 22, 2024
    Copy the full SHA
    570dd04 View commit details

  4. release 2.0.4

    @sporth
    sporth committed Oct 22, 2024
    Copy the full SHA
    c316115 View commit details

  5. release 2.0.4

    @sporth
    sporth committed Oct 22, 2024
    Copy the full SHA
    4e91d40 View commit details

  6. release 2.0.4

    @sporth
    sporth committed Oct 22, 2024
    Copy the full SHA
    eab822c View commit details

  7. release 2.0.4

    @sporth
    sporth committed Oct 22, 2024
    Copy the full SHA
    751d9e0 View commit details

  8. release 2.0.4

    @sporth
    sporth committed Oct 22, 2024
    Copy the full SHA
    840425e View commit details

Commits on Nov 8, 2024

  1. release 2.0.5

    @sporth
    sporth committed Nov 8, 2024
    Copy the full SHA
    463461c View commit details

Commits on Jan 9, 2025

  1. 2.0.6

    @sporth
    sporth committed Jan 9, 2025
    Copy the full SHA
    934810d View commit details

  2. Merge pull request #26 from docker/2.0.6 

    2.0.6
    @sporth
    sporth committed Jan 9, 2025
    Copy the full SHA
    cf97cda View commit details
37 changes: 16 additions & 21 deletions Dockerfile
View file
@@ -1,40 +1,35 @@
FROM alpine:3.7 as bootstrap
FROM rockylinux/rockylinux:8.10

ARG version=1.17.4
ARG version=2.0.6

COPY bootstrapfiles/shibui-${version}.war.sha256sum .

RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.war \
&& sha256sum -c shibui-${version}.war.sha256sum && mv shibui-${version}.war shibui.war
#RUN yum -q -qy update \
# && yum -qy install --setopt=tsflags=nodocs epel-release \
# && yum -qy install curl cronie supervisor \
# && yum clean all \
# && rm -rf /var/cache/yum
RUN yum -qy install --setopt=tsflags=nodocs epel-release \
&& yum install -qy curl supervisor wget

FROM centos:7
RUN mkdir -p /opt/shibui
RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.war
RUN sha256sum -c shibui-${version}.war.sha256sum && mv shibui-${version}.war /opt/shibui/shibui.war

# beacon env
ENV VERSION=${version} \
TIERVERSION=20200210 \
IMAGE=shibboleth_idp_ui \
MAINTAINER=InCommon
ENV TIERVERSION=MCM_2.0.5

# Install Corretto Java JDK
#Corretto download page: https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html
ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-11-x64-linux-jdk.rpm
ARG CORRETTO_RPM=amazon-corretto-11-x64-linux-jdk.rpm
ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-17-x64-linux-jdk.rpm
ARG CORRETTO_RPM=amazon-corretto-17-x64-linux-jdk.rpm
COPY containerfiles/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.11.0-amazon-corretto

RUN yum -q -qy update \
&& yum -qy install --setopt=tsflags=nodocs epel-release \
&& yum -qy install curl cronie supervisor \
&& yum clean all \
&& rm -rf /var/cache/yum

RUN mkdir -p /opt/shibui
COPY --from=bootstrap shibui.war /opt/shibui/
ENV JAVA_HOME=/usr/lib/jvm/java-1.17.0-amazon-corretto

COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf
COPY containerfiles/users.txt /opt/shibui
1 change: 1 addition & 0 deletions bootstrapfiles/shibui-1.18.0.war.sha256sum
View file
@@ -0,0 +1 @@
11f048d45f9c8c82fda0c09c6ac46f8371e9d5dc505cacb2b3b407162675c49e shibui-1.18.0.war
1 change: 1 addition & 0 deletions bootstrapfiles/shibui-2.0.0.war.sha256sum
View file
@@ -0,0 +1 @@
ce537fe9ab834d6efafe6be3413a98a2ec4cafb5634634f71b01f9c86fd29ebf shibui-2.0.0.war
1 change: 1 addition & 0 deletions bootstrapfiles/shibui-2.0.1.war.sha256sum
View file
@@ -0,0 +1 @@
506003514a20c33db7654c17389f0fc7ff3e1e6a4192980761b17a4f24a6f38c shibui-2.0.1.war
1 change: 1 addition & 0 deletions bootstrapfiles/shibui-2.0.4.war.sha256sum
View file
@@ -0,0 +1 @@
308dbceb044978d5c8989a9bfa9c83a30e52b4113756ce8b32f50622e66b8a79 shibui-2.0.4.war
1 change: 1 addition & 0 deletions bootstrapfiles/shibui-2.0.5.war.sha256sum
View file
@@ -0,0 +1 @@
006a6da1afb958bc572115e63e31cc0b0bae2eb80d1a33d9862277cfcad6daba shibui-2.0.5.war
1 change: 1 addition & 0 deletions bootstrapfiles/shibui-2.0.6.war.sha256sum
View file
@@ -0,0 +1 @@
807e245e8c27a9faf9dc950d2f2863c6330f8dd1e26dba35fde87ba2bd498307 shibui-2.0.6.war
30 changes: 0 additions & 30 deletions containerfiles/sendtierbeacon.sh
View file

This file was deleted.

15 changes: 0 additions & 15 deletions containerfiles/setupcron.sh
View file

This file was deleted.