Skip to content

Commit

Permalink
keycloak 26 docker upgrades (#164)
Browse files Browse the repository at this point in the history 
* keycloak 26 docker upgrades

* <bot> update dependencies*.log files(s)

---------

Co-authored-by: github-actions <[email protected]>
  • Loading branch information
@dsschult
dsschult and github-actions authored Nov 19, 2024
1 parent 3a31590 commit 2547f3a
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 36 deletions.
62 changes: 31 additions & 31 deletions dependencies-from-Dockerfile.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ cachetools==5.5.0
certifi==2024.8.30
cffi==1.17.1
charset-normalizer==3.4.0
cryptography==43.0.1
cryptography==43.0.3
dnspython==2.7.0
google-api-core==2.21.0
google-api-python-client==2.149.0
google-auth==2.35.0
google-api-core==2.23.0
google-api-python-client==2.153.0
google-auth==2.36.0
google-auth-httplib2==0.2.0
google-auth-oauthlib==1.2.1
googleapis-common-protos==1.65.0
googleapis-common-protos==1.66.0
httplib2==0.22.0
idna==3.10
jsonpath-ng==1.7.0
Expand All @@ -32,17 +32,17 @@ oauthlib==3.2.2
pamqp==3.3.0
ply==3.11
propcache==0.2.0
proto-plus==1.24.0
protobuf==5.28.2
proto-plus==1.25.0
protobuf==5.28.3
pyasn1==0.6.1
pyasn1_modules==0.4.1
pycparser==2.22
PyJWT==2.9.0
PyJWT==2.10.0
pymongo==4.9.2
pyparsing==3.2.0
qrcode==8.0
requests==2.32.3
requests-futures==1.0.1
requests-futures==1.0.2
requests-oauthlib==2.0.0
rsa==4.9
tornado==6.4.1
Expand All @@ -52,42 +52,42 @@ uritemplate==4.1.1
urllib3==2.2.3
wipac-dev-tools==1.13.0
-e /home/keycloak
wipac-rest-tools==1.8.0
yarl==1.15.4
wipac-rest-tools==1.8.2
yarl==1.17.2
########################################################################
# pipdeptree
########################################################################
asyncache==0.3.1
└── cachetools [required: >=5.2.0,<6.0.0, installed: 5.5.0]
cryptography==43.0.1
cryptography==43.0.3
└── cffi [required: >=1.12, installed: 1.17.1]
└── pycparser [required: Any, installed: 2.22]
google-api-python-client==2.149.0
├── google-api-core [required: >=1.31.5,<3.0.0.dev0,!=2.3.0,!=2.2.*,!=2.1.*,!=2.0.*, installed: 2.21.0]
│ ├── google-auth [required: >=2.14.1,<3.0.dev0, installed: 2.35.0]
google-api-python-client==2.153.0
├── google-api-core [required: >=1.31.5,<3.0.0.dev0,!=2.3.0,!=2.2.*,!=2.1.*,!=2.0.*, installed: 2.23.0]
│ ├── google-auth [required: >=2.14.1,<3.0.dev0, installed: 2.36.0]
│ │ ├── cachetools [required: >=2.0.0,<6.0, installed: 5.5.0]
│ │ ├── pyasn1_modules [required: >=0.2.1, installed: 0.4.1]
│ │ │ └── pyasn1 [required: >=0.4.6,<0.7.0, installed: 0.6.1]
│ │ └── rsa [required: >=3.1.4,<5, installed: 4.9]
│ │ └── pyasn1 [required: >=0.1.3, installed: 0.6.1]
│ ├── googleapis-common-protos [required: >=1.56.2,<2.0.dev0, installed: 1.65.0]
│ │ └── protobuf [required: >=3.20.2,<6.0.0.dev0,!=4.21.5,!=4.21.4,!=4.21.3,!=4.21.2,!=4.21.1,!=3.20.1,!=3.20.0, installed: 5.28.2]
│ ├── proto-plus [required: >=1.22.3,<2.0.0dev, installed: 1.24.0]
│ │ └── protobuf [required: >=3.19.0,<6.0.0dev, installed: 5.28.2]
│ ├── protobuf [required: >=3.19.5,<6.0.0.dev0,!=4.21.5,!=4.21.4,!=4.21.3,!=4.21.2,!=4.21.1,!=4.21.0,!=3.20.1,!=3.20.0, installed: 5.28.2]
│ ├── googleapis-common-protos [required: >=1.56.2,<2.0.dev0, installed: 1.66.0]
│ │ └── protobuf [required: >=3.20.2,<6.0.0.dev0,!=4.21.5,!=4.21.4,!=4.21.3,!=4.21.2,!=4.21.1,!=3.20.1,!=3.20.0, installed: 5.28.3]
│ ├── proto-plus [required: >=1.22.3,<2.0.0dev, installed: 1.25.0]
│ │ └── protobuf [required: >=3.19.0,<6.0.0dev, installed: 5.28.3]
│ ├── protobuf [required: >=3.19.5,<6.0.0.dev0,!=4.21.5,!=4.21.4,!=4.21.3,!=4.21.2,!=4.21.1,!=4.21.0,!=3.20.1,!=3.20.0, installed: 5.28.3]
│ └── requests [required: >=2.18.0,<3.0.0.dev0, installed: 2.32.3]
│ ├── certifi [required: >=2017.4.17, installed: 2024.8.30]
│ ├── charset-normalizer [required: >=2,<4, installed: 3.4.0]
│ ├── idna [required: >=2.5,<4, installed: 3.10]
│ └── urllib3 [required: >=1.21.1,<3, installed: 2.2.3]
├── google-auth [required: >=1.32.0,<3.0.0.dev0,!=2.25.0,!=2.24.0, installed: 2.35.0]
├── google-auth [required: >=1.32.0,<3.0.0.dev0,!=2.25.0,!=2.24.0, installed: 2.36.0]
│ ├── cachetools [required: >=2.0.0,<6.0, installed: 5.5.0]
│ ├── pyasn1_modules [required: >=0.2.1, installed: 0.4.1]
│ │ └── pyasn1 [required: >=0.4.6,<0.7.0, installed: 0.6.1]
│ └── rsa [required: >=3.1.4,<5, installed: 4.9]
│ └── pyasn1 [required: >=0.1.3, installed: 0.6.1]
├── google-auth-httplib2 [required: >=0.2.0,<1.0.0, installed: 0.2.0]
│ ├── google-auth [required: Any, installed: 2.35.0]
│ ├── google-auth [required: Any, installed: 2.36.0]
│ │ ├── cachetools [required: >=2.0.0,<6.0, installed: 5.5.0]
│ │ ├── pyasn1_modules [required: >=0.2.1, installed: 0.4.1]
│ │ │ └── pyasn1 [required: >=0.4.6,<0.7.0, installed: 0.6.1]
Expand All @@ -99,7 +99,7 @@ google-api-python-client==2.149.0
│ └── pyparsing [required: >=2.4.2,<4,!=3.0.3,!=3.0.2,!=3.0.1,!=3.0.0, installed: 3.2.0]
└── uritemplate [required: >=3.0.1,<5, installed: 4.1.1]
google-auth-oauthlib==1.2.1
├── google-auth [required: >=2.15.0, installed: 2.35.0]
├── google-auth [required: >=2.15.0, installed: 2.36.0]
│ ├── cachetools [required: >=2.0.0,<6.0, installed: 5.5.0]
│ ├── pyasn1_modules [required: >=0.2.1, installed: 0.4.1]
│ │ └── pyasn1 [required: >=0.4.6,<0.7.0, installed: 0.6.1]
Expand All @@ -115,20 +115,20 @@ google-auth-oauthlib==1.2.1
jsonpath-ng==1.7.0
└── ply [required: Any, installed: 3.11]
pipdeptree==2.23.4
├── packaging [required: >=24.1, installed: 24.1]
└── pip [required: >=24.2, installed: 24.2]
├── packaging [required: >=24.1, installed: 24.2]
└── pip [required: >=24.2, installed: 24.3.1]
setuptools==65.5.1
wheel==0.44.0
wheel==0.45.0
wipac-keycloak-rest-services
├── aio-pika [required: Any, installed: 9.4.3]
│ ├── aiormq [required: >=6.8.0,<6.9.0, installed: 6.8.1]
│ │ ├── pamqp [required: ==3.3.0, installed: 3.3.0]
│ │ └── yarl [required: Any, installed: 1.15.4]
│ │ └── yarl [required: Any, installed: 1.17.2]
│ │ ├── idna [required: >=2.0, installed: 3.10]
│ │ ├── multidict [required: >=4.0, installed: 6.1.0]
│ │ │ └── typing_extensions [required: >=4.1.0, installed: 4.12.2]
│ │ └── propcache [required: >=0.2.0, installed: 0.2.0]
│ └── yarl [required: Any, installed: 1.15.4]
│ └── yarl [required: Any, installed: 1.17.2]
│ ├── idna [required: >=2.0, installed: 3.10]
│ ├── multidict [required: >=4.0, installed: 6.1.0]
│ │ └── typing_extensions [required: >=4.1.0, installed: 4.12.2]
Expand All @@ -152,16 +152,16 @@ wipac-keycloak-rest-services
│ │ ├── idna [required: >=2.5,<4, installed: 3.10]
│ │ └── urllib3 [required: >=1.21.1,<3, installed: 2.2.3]
│ └── typing_extensions [required: Any, installed: 4.12.2]
└── wipac-rest-tools [required: Any, installed: 1.8.0]
└── wipac-rest-tools [required: Any, installed: 1.8.2]
├── cachetools [required: Any, installed: 5.5.0]
├── PyJWT [required: !=2.6.0, installed: 2.9.0]
├── PyJWT [required: !=2.6.0, installed: 2.10.0]
├── qrcode [required: Any, installed: 8.0]
├── requests [required: Any, installed: 2.32.3]
│ ├── certifi [required: >=2017.4.17, installed: 2024.8.30]
│ ├── charset-normalizer [required: >=2,<4, installed: 3.4.0]
│ ├── idna [required: >=2.5,<4, installed: 3.10]
│ └── urllib3 [required: >=1.21.1,<3, installed: 2.2.3]
├── requests-futures [required: Any, installed: 1.0.1]
├── requests-futures [required: Any, installed: 1.0.2]
│ └── requests [required: >=1.2.0, installed: 2.32.3]
│ ├── certifi [required: >=2017.4.17, installed: 2024.8.30]
│ ├── charset-normalizer [required: >=2,<4, installed: 3.4.0]
Expand Down
9 changes: 5 additions & 4 deletions resources/keycloak-image/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
FROM quay.io/keycloak/keycloak:24.0.3 as builder
FROM quay.io/keycloak/keycloak:26.0.5 as builder

# Keycloak core settings
ENV KC_HTTP_ENABLED="true"
ENV KC_HTTP_RELATIVE_PATH="/auth"
ENV KC_FEATURES=token-exchange
ENV KC_FEATURES=token-exchange,scripts
ENV KC_LOG=console

# rabbitmq settings
COPY resources/keycloak-to-rabbit-3.0.jar /opt/keycloak/providers/
Expand All @@ -12,10 +13,10 @@ ENV KK_TO_RMQ_PASSWORD=admin
ENV KK_TO_RMQ_VHOST=keycloak

# theme
COPY keycloak_theme /opt/keycloak/themes/keycloak
#COPY keycloak_theme /opt/keycloak/themes/keycloak

# testing TLS cert
RUN keytool -genkeypair -storepass password -storetype PKCS12 -keyalg RSA -keysize 2048 -dname "CN=server" -alias server -ext "SAN:c=DNS:localhost,IP:127.0.0.1" -keystore /opt/keycloak/conf/server.keystore
#RUN keytool -genkeypair -storepass password -storetype PKCS12 -keyalg RSA -keysize 2048 -dname "CN=server" -alias server -ext "SAN:c=DNS:localhost,IP:127.0.0.1" -keystore /opt/keycloak/conf/server.keystore

RUN /opt/keycloak/bin/kc.sh build

Expand Down
2 changes: 1 addition & 1 deletion resources/start-keycloak.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
docker build -t krs-test-keycloak -f ./resources/keycloak-image/Dockerfile .

docker run -d --name keycloak --network host \
--env KEYCLOAK_ADMIN=admin --env KEYCLOAK_ADMIN_PASSWORD=admin \
--env KC_BOOTSTRAP_ADMIN_USERNAME=admin --env KC_BOOTSTRAP_ADMIN_PASSWORD=admin \
krs-test-keycloak start-dev

until curl http://localhost:8080 >/dev/null 2>/dev/null
Expand Down

0 comments on commit 2547f3a

Please sign in to comment.