Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Loading status checks…
4.3.0
@mchyzer
mchyzer committed Jun 27, 2023
1 parent 2691130 commit 229ed86
Showing 15 changed files with 88 additions and 203 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
View file
@@ -8,8 +8,8 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \

ARG GROUPER_CONTAINER_VERSION

ENV GROUPER_VERSION=4.2.2 \
GROUPER_CONTAINER_VERSION=4.2.2 \
ENV GROUPER_VERSION=4.3.0 \
GROUPER_CONTAINER_VERSION=4.3.0 \
JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto \
PATH=$PATH:$JAVA_HOME/bin \
GROUPER_HOME=/opt/grouper/grouperWebapp/WEB-INF
2 changes: 1 addition & 1 deletion Dockerfile2
View file
@@ -59,7 +59,7 @@ RUN cd /tmp \

# testing container
# see output with docker build . --tag my:grouper
# DOCKER_BUILDKIT=0 docker build --progress=plain -t mygrouper .
# DOCKER_BUILDKIT=0 docker build -f Dockerfile2 --progress=plain -t mygrouper .
# docker run --detach --name mygrouper mygrouper:latest
# docker exec -it mygrouper bash

4 changes: 4 additions & 0 deletions Dockerfile3
View file
@@ -0,0 +1,4 @@
FROM i2incommon/grouper:4.3.0

ENTRYPOINT ["ping"]
CMD ["google.com"]
3 changes: 3 additions & 0 deletions build3.sh
View file
@@ -0,0 +1,3 @@
#!/bin/bash

docker build -t my-grouper3 -f Dockerfile3 .
4 changes: 4 additions & 0 deletions container_files/tomcat/conf/createPatches.txt
View file
@@ -0,0 +1,4 @@
# note: get the server.xml into the original, make sure it ends with newline if the file does
diff -u server.xml.original server.xml.turnOnAjp > server.xml.turnOnAjp.patch
diff -u server.xml.turnOnAjp server.xml.loggingpipe > server.xml.loggingpipe.patch
diff -u server.xml.turnOnAjp server.xml.nologging > server.xml.nologging.patch
18 changes: 13 additions & 5 deletions container_files/tomcat/conf/server.xml.loggingpipe
View file
@@ -68,13 +68,17 @@
-->
<Connector port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
redirectPort="8443"
maxParameterCount="1000"
/>
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
redirectPort="8443"
maxParameterCount="1000"
/>
-->
<!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
This connector uses the NIO implementation. The default
@@ -85,7 +89,9 @@
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
maxThreads="150" SSLEnabled="true">
maxThreads="150" SSLEnabled="true"
maxParameterCount="1000"
>
<SSLHostConfig>
<Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
type="RSA" />
@@ -100,7 +106,9 @@
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
maxThreads="150" SSLEnabled="true" >
maxThreads="150" SSLEnabled="true"
maxParameterCount="1000"
>
<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
<SSLHostConfig>
<Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
@@ -112,7 +120,7 @@
-->

<!-- Define an AJP 1.3 Connector on port 8009 -->
<Connector secretRequired="false" secure="true" scheme="https" URIEncoding="UTF-8" tomcatAuthentication="false" port="8009" protocol="AJP/1.3" redirectPort="8443" />
<Connector secretRequired="false" secure="true" scheme="https" URIEncoding="UTF-8" tomcatAuthentication="false" port="8009" protocol="AJP/1.3" redirectPort="8443" maxParameterCount="1000" />

<!-- An Engine represents the entry point (within Catalina) that processes
every request. The Engine implementation for Tomcat stand alone
6 changes: 3 additions & 3 deletions container_files/tomcat/conf/server.xml.loggingpipe.patch
View file
@@ -1,6 +1,6 @@
--- server.xml.turnOnAjp 2023-01-17 12:53:45.160869124 -0500
+++ server.xml.loggingpipe 2023-01-17 12:56:35.572142521 -0500
@@ -155,9 +155,9 @@
--- server.xml.turnOnAjp 2023-06-27 13:54:28.000000000 -0400
+++ server.xml.loggingpipe 2023-06-27 13:53:45.000000000 -0400
@@ -163,9 +163,9 @@
<!-- Access log processes all example.
Documentation at: /docs/config/valve.html
Note: The pattern used is equivalent to using pattern="common" -->
18 changes: 13 additions & 5 deletions container_files/tomcat/conf/server.xml.nologging
View file
@@ -68,13 +68,17 @@
-->
<Connector port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
redirectPort="8443"
maxParameterCount="1000"
/>
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
redirectPort="8443"
maxParameterCount="1000"
/>
-->
<!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
This connector uses the NIO implementation. The default
@@ -85,7 +89,9 @@
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
maxThreads="150" SSLEnabled="true">
maxThreads="150" SSLEnabled="true"
maxParameterCount="1000"
>
<SSLHostConfig>
<Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
type="RSA" />
@@ -100,7 +106,9 @@
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
maxThreads="150" SSLEnabled="true" >
maxThreads="150" SSLEnabled="true"
maxParameterCount="1000"
>
<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
<SSLHostConfig>
<Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
@@ -112,7 +120,7 @@
-->

<!-- Define an AJP 1.3 Connector on port 8009 -->
<Connector secretRequired="false" secure="true" scheme="https" URIEncoding="UTF-8" tomcatAuthentication="false" port="8009" protocol="AJP/1.3" redirectPort="8443" />
<Connector secretRequired="false" secure="true" scheme="https" URIEncoding="UTF-8" tomcatAuthentication="false" port="8009" protocol="AJP/1.3" redirectPort="8443" maxParameterCount="1000" />

<!-- An Engine represents the entry point (within Catalina) that processes
every request. The Engine implementation for Tomcat stand alone
6 changes: 3 additions & 3 deletions container_files/tomcat/conf/server.xml.nologging.patch
View file
@@ -1,6 +1,6 @@
--- server.xml.turnOnAjp 2023-01-17 12:53:45.160869124 -0500
+++ server.xml.nologging 2023-01-17 12:57:49.045158802 -0500
@@ -155,9 +155,9 @@
--- server.xml.turnOnAjp 2023-06-27 13:54:28.000000000 -0400
+++ server.xml.nologging 2023-06-27 13:54:16.000000000 -0400
@@ -163,9 +163,9 @@
<!-- Access log processes all example.
Documentation at: /docs/config/valve.html
Note: The pattern used is equivalent to using pattern="common" -->
20 changes: 15 additions & 5 deletions container_files/tomcat/conf/server.xml.original
View file
@@ -68,13 +68,17 @@
-->
<Connector port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
redirectPort="8443"
maxParameterCount="1000"
/>
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
redirectPort="8443"
maxParameterCount="1000"
/>
-->
<!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
This connector uses the NIO implementation. The default
@@ -85,7 +89,9 @@
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
maxThreads="150" SSLEnabled="true">
maxThreads="150" SSLEnabled="true"
maxParameterCount="1000"
>
<SSLHostConfig>
<Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
type="RSA" />
@@ -100,7 +106,9 @@
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
maxThreads="150" SSLEnabled="true" >
maxThreads="150" SSLEnabled="true"
maxParameterCount="1000"
>
<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
<SSLHostConfig>
<Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
@@ -116,7 +124,9 @@
<Connector protocol="AJP/1.3"
address="::1"
port="8009"
redirectPort="8443" />
redirectPort="8443"
maxParameterCount="1000"
/>
-->

<!-- An Engine represents the entry point (within Catalina) that processes
18 changes: 13 additions & 5 deletions container_files/tomcat/conf/server.xml.turnOnAjp
View file
@@ -68,13 +68,17 @@
-->
<Connector port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
redirectPort="8443"
maxParameterCount="1000"
/>
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
redirectPort="8443"
maxParameterCount="1000"
/>
-->
<!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
This connector uses the NIO implementation. The default
@@ -85,7 +89,9 @@
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
maxThreads="150" SSLEnabled="true">
maxThreads="150" SSLEnabled="true"
maxParameterCount="1000"
>
<SSLHostConfig>
<Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
type="RSA" />
@@ -100,7 +106,9 @@
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
maxThreads="150" SSLEnabled="true" >
maxThreads="150" SSLEnabled="true"
maxParameterCount="1000"
>
<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
<SSLHostConfig>
<Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
@@ -112,7 +120,7 @@
-->

<!-- Define an AJP 1.3 Connector on port 8009 -->
<Connector secretRequired="false" secure="true" scheme="https" URIEncoding="UTF-8" tomcatAuthentication="false" port="8009" protocol="AJP/1.3" redirectPort="8443" />
<Connector secretRequired="false" secure="true" scheme="https" URIEncoding="UTF-8" tomcatAuthentication="false" port="8009" protocol="AJP/1.3" redirectPort="8443" maxParameterCount="1000" />

<!-- An Engine represents the entry point (within Catalina) that processes
every request. The Engine implementation for Tomcat stand alone
12 changes: 7 additions & 5 deletions container_files/tomcat/conf/server.xml.turnOnAjp.patch
View file
@@ -1,16 +1,18 @@
--- server.xml.original 2023-01-17 12:49:38.405305157 -0500
+++ server.xml.turnOnAjp 2023-01-17 12:53:45.160869124 -0500
@@ -112,12 +112,7 @@
--- server.xml.original 2023-06-27 13:54:24.000000000 -0400
+++ server.xml.turnOnAjp 2023-06-27 13:54:28.000000000 -0400
@@ -120,14 +120,7 @@
-->

<!-- Define an AJP 1.3 Connector on port 8009 -->
- <!--
- <Connector protocol="AJP/1.3"
- address="::1"
- port="8009"
- redirectPort="8443" />
- redirectPort="8443"
- maxParameterCount="1000"
- />
- -->
+ <Connector secretRequired="false" secure="true" scheme="https" URIEncoding="UTF-8" tomcatAuthentication="false" port="8009" protocol="AJP/1.3" redirectPort="8443" address="0.0.0.0" allowedRequestAttributesPattern=".*" />
+ <Connector secretRequired="false" secure="true" scheme="https" URIEncoding="UTF-8" tomcatAuthentication="false" port="8009" protocol="AJP/1.3" redirectPort="8443" maxParameterCount="1000" />

<!-- An Engine represents the entry point (within Catalina) that processes
every request. The Engine implementation for Tomcat stand alone
169 changes: 0 additions & 169 deletions container_files/tomcat/conf/server.xml.v2_5_29
View file

This file was deleted.

4 changes: 4 additions & 0 deletions run3.sh
View file
@@ -0,0 +1,4 @@
#!/bin/bash

docker run -d --name my-grouper3 my-grouper3:latest

3 changes: 3 additions & 0 deletions ssh3.sh
View file
@@ -0,0 +1,3 @@
#!/bin/bash

docker exec -it my-grouper3 bash

0 comments on commit 229ed86

Please sign in to comment.