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: main
Choose a base ref
...
head repository: docker/shib-ui
compare: 1.9.0
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 11 commits
  • 6 files changed
  • 1 contributor

Commits on Aug 2, 2021

  1. 1.8.0

    @chubing
    chubing committed Aug 2, 2021
    Loading status checks…
    Copy the full SHA
    0721ba6 View commit details

  2. Update Dockerfile

    @chubing
    chubing committed Aug 2, 2021
    Loading status checks…
    Copy the full SHA
    830786a View commit details

  3. 1.8.0

    @chubing
    chubing committed Aug 2, 2021
    Loading status checks…
    Copy the full SHA
    9d5ad81 View commit details

  4. add sha256 checksum

    @chubing
    chubing committed Aug 2, 2021
    Loading status checks…
    Copy the full SHA
    e4e401d View commit details

  5. update dockerhub repo from tier to i2incommon

    @chubing
    chubing committed Aug 2, 2021
    Loading status checks…
    Copy the full SHA
    91a0ee6 View commit details

  6. Update Dockerfile

    @chubing
    chubing committed Aug 2, 2021
    Loading status checks…
    Copy the full SHA
    e87eced View commit details

  7. Create corretto-signing-key.pub

    @chubing
    chubing committed Aug 2, 2021
    Loading status checks…
    Copy the full SHA
    1257dc9 View commit details

  8. Update Dockerfile

    @chubing
    chubing committed Aug 2, 2021
    Loading status checks…
    Copy the full SHA
    471e3d6 View commit details

  9. Update Dockerfile

    @chubing
    chubing committed Aug 2, 2021
    Loading status checks…
    Copy the full SHA
    d8da2d3 View commit details

Commits on Sep 3, 2021

  1. Update Dockerfile

    @chubing
    chubing committed Sep 3, 2021
    Loading status checks…
    Copy the full SHA
    0b43ae3 View commit details

  2. Create shibui-1.9.0.war.sha256sum

    @chubing
    chubing committed Sep 3, 2021
    Loading status checks…
    Copy the full SHA
    a238d08 View commit details
Showing with 49 additions and 8 deletions.
  1. +15 −6 Dockerfile
  2. +1 −0 bootstrapfiles/shibui-1.8.0.war.sha256sum
  3. +1 −0 bootstrapfiles/shibui-1.9.0.war.sha256sum
  4. +1 −1 common.bash
  5. +30 −0 containerfiles/corretto-signing-key.pub
  6. +1 −1 test-compose/docker-compose.yml
21 changes: 15 additions & 6 deletions Dockerfile
View file
@@ -1,6 +1,6 @@
FROM alpine:3.7 as bootstrap

ARG version=1.7.0
ARG version=1.9.0

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

@@ -11,17 +11,26 @@ FROM centos:7

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

COPY containerfiles/RPM-GPG-KEY-azulsystems .

RUN rpm --import RPM-GPG-KEY-azulsystems
RUN curl -o /etc/yum.repos.d/zulu.repo http://repos.azulsystems.com/rhel/zulu.repo
# 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
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-11-amazon-corretto

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

1 change: 1 addition & 0 deletions bootstrapfiles/shibui-1.8.0.war.sha256sum
View file
@@ -0,0 +1 @@
da99216de04e016f411089523e370388703492ab44b37e0bad4145a37144da75 shibui-1.8.0.war
1 change: 1 addition & 0 deletions bootstrapfiles/shibui-1.9.0.war.sha256sum
View file
@@ -0,0 +1 @@
19c8a298193fbdce3aae736d5342e8df8d5552bb284d073161c8278140aed582 shibui-1.9.0.war
2 changes: 1 addition & 1 deletion common.bash
View file
@@ -1,3 +1,3 @@
maintainer="i2incommon"
imagename="shib-idp-ui"
version=1.7.0
version=1.8.0
30 changes: 30 additions & 0 deletions containerfiles/corretto-signing-key.pub
View file
@@ -0,0 +1,30 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.22 (GNU/Linux)

mQINBF3pShkBEADJzglehQDFlc1+9VFubVPzpq8ZYtzmJkNjf09scOUzaKZOm3Ar
mPh9Rufk4mB7t1LP4JeHAKAS17ggCHGVxRGXAAQ9Laf8ibX4SiFO3Ehyyl3smuFf
ZhexBnvc7vRc4EUlKqarCQRUlaraDOrmq7WbhXdvCgc4u2uBLwUjAd3PHQUByAZw
lsEQzpQnehNomjrE0pO6ms9AhmpbXlf/yr14EXvlo4lTd8QUdvS+AOCYfrHb9WGO
IEsyyDuzuf2grV/QFpoi0VBhTCyiNYXla2AfCreMGlOCYsjw1nU93OyAqF3SaTOC
o52yrzcb2NpbBDwRXOHNwe1md+DbRwEfkaWr5I91FqRpgEeawqyxY1miJRHduhsz
WTgTMBF/EQfmTspD2YBX/BjNJTrdDXYvACX8slVV/vBnpi+dEpVEK3hh21ij991S
lv8YoFnoC7XP44C7WNpVQpGW9ZWpnjLCvm3DMKW0r3Vfb3XDYhnHI1Q14Pxn0cwf
x1L2RA4doyWd1TRZBFBe2f0vSkZT0YFaibKaKi6AkDIMU/+u+/e3wWbYXqzsSITj
ffMkpMMNSwxbm8JqnsudjuzdEsYAiBUcFMwWysQDcyu63un2OmLKLfKxy19vCpS1
8mkNy95JuO4jZtu+IiinvSSjlbJmslu3uK3/cTRsWaB7BRtHewE7SugMOwARAQAB
tEhBbWF6b24gU2VydmljZXMgTExDIChBbWF6b24gQ29ycmV0dG8gcmVsZWFzZSkg
PGNvcnJldHRvLXRlYW1AYW1hem9uLmNvbT6JAjEEEwECABsFAl3pShkCGy8FCQlm
AYAFFQgKCQsCHgECF4AACgkQoSJUKrBPJOOJDg/6AqmntaxDWX6qfR++0qwtD9Lp
vgONFvA+9AYQeGt7OX79O/SSPy97Kvn6DYRBdelShTAH60DbXCUs42sIRFqRjmHY
HfIgOkUJjWoJz9oQnY+mzAKbOohCrR+YIvyCegFb0dboDaqSQ4w68+d1is7L84pz
ZB2j0nrQDbFihPmR+epfHkLUGGywuZHCdEFfD8nXMOJeVbgSzf7Vhl8ZrydIkZTI
7aASG5MkDO/GuVpEGQYAnH9h/jzJlfUKndswC6UFcM5Ol07pDPdHVBAi9q1SyxDe
uSS1NgDW7OW7zgpB+4/PrZKKiEP/fBAWa9nFSLwTaMdsoaAuQAmmgbqYfy3XXKK7
IBaKSnJpQDvNb0vmXJEY3qX2Bfh0p1KCeaQhYwIJi8rPQWC24fiLY9bdCIlkbbPQ
CSNOEq9nUWRg9KbUGmd/PWSkT6Jheyq3BZBF1YPYEt8o/l437HHd08lREqH0sana
Hb72GZTi2RUrNBBp5C1e8MqllXE6RKmri2m0TSBHR5C4ZLII9duyA839dYIA4KGU
nmetZckuRuwHFmd3/YWtMEfn47UedzhVT16z3OvBipHU1BKzLGcvUFXrUKvpJQlh
dNPUQh+wb91EzItjkJ96m+N+81iQdN3yd8cE38NTA8b+Qc7tmTYxwNZxcv16FxLA
y2VhKc09A8RwSI69vDs=
=ZNRH
-----END PGP PUBLIC KEY BLOCK-----
2 changes: 1 addition & 1 deletion test-compose/docker-compose.yml
View file
@@ -16,7 +16,7 @@ services:
volumes:
- mariadb-data:/var/lib/mysql
shibui:
image: tier/shib-idp-ui:1.7.0
image: i2incommon/shib-idp-ui:1.8.0
depends_on:
- db
ports: