Skip to content

Commit

Permalink
KEYCLOAK-11 Return missing folio-scripts.jar (#17)
Browse files Browse the repository at this point in the history
  • Loading branch information
pfilippov-epam authored Jul 11, 2024
1 parent 6df85f6 commit 9c27294
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ ENV KC_DB=postgres
ENV KC_HEALTH_ENABLED=true
ENV KC_METRICS_ENABLED=true
ENV KC_FEATURES=scripts,token-exchange,admin-fine-grained-authz
COPY --chown=keycloak:keycloak ./libs/folio-scripts.jar /opt/keycloak/providers/
COPY --chown=keycloak:keycloak ./conf/* /opt/keycloak/conf/
COPY --chown=keycloak:keycloak ./cache-ispn-jdbc.xml /opt/keycloak/conf/cache-ispn-jdbc.xml
COPY --chown=keycloak:keycloak libs/folio-scripts.jar /opt/keycloak/providers/
COPY --chown=keycloak:keycloak conf/* /opt/keycloak/conf/
COPY --chown=keycloak:keycloak cache-ispn-jdbc.xml /opt/keycloak/conf/cache-ispn-jdbc.xml

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

Expand All @@ -19,7 +19,7 @@ RUN mkdir /opt/keycloak/bin/folio
COPY --chown=keycloak:keycloak folio/configure-realms.sh /opt/keycloak/bin/folio/
COPY --chown=keycloak:keycloak folio/setup-admin-client.sh /opt/keycloak/bin/folio/
COPY --chown=keycloak:keycloak folio/start.sh /opt/keycloak/bin/folio/
COPY --chown=keycloak:keycloak ./custom-theme /opt/keycloak/themes/custom-theme
COPY --chown=keycloak:keycloak custom-theme /opt/keycloak/themes/custom-theme

USER root
RUN chmod -R 550 /opt/keycloak/bin/folio
Expand Down
11 changes: 5 additions & 6 deletions Dockerfile-fips
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ ARG ALPINE_VERSION=3.20.1
ARG KEYCLOAK_VERSION=25.0.1
FROM alpine:$ALPINE_VERSION AS fipsJarDownloader

RUN apk upgrade --no-cache && apk --no-cache add curl

# Set the working directory
WORKDIR /tmp/fips-jars

Expand All @@ -28,9 +26,10 @@ ENV KC_METRICS_ENABLED=true
ENV KC_FEATURES=scripts,token-exchange,admin-fine-grained-authz,fips
ENV KC_FIPS_MODE=strict

COPY --chown=keycloak:keycloak --from=fipsJarDownloader ./tmp/fips-jars/ /opt/keycloak/providers/
COPY --chown=keycloak:keycloak ./conf/* /opt/keycloak/conf/
COPY --chown=keycloak:keycloak ./cache-ispn-jdbc.xml /opt/keycloak/conf/cache-ispn-jdbc.xml
COPY --chown=keycloak:keycloak --from=fipsJarDownloader /tmp/fips-jars/ /opt/keycloak/providers/
COPY --chown=keycloak:keycloak libs/folio-scripts.jar /opt/keycloak/providers/
COPY --chown=keycloak:keycloak conf/* /opt/keycloak/conf/
COPY --chown=keycloak:keycloak cache-ispn-jdbc.xml /opt/keycloak/conf/cache-ispn-jdbc.xml

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

Expand All @@ -42,7 +41,7 @@ RUN mkdir /opt/keycloak/bin/folio
COPY --chown=keycloak:keycloak folio/configure-realms.sh /opt/keycloak/bin/folio/configure-realms.sh
COPY --chown=keycloak:keycloak folio/setup-admin-client.sh /opt/keycloak/bin/folio/setup-admin-client.sh
COPY --chown=keycloak:keycloak folio/start-fips.sh /opt/keycloak/bin/folio/start-fips.sh
COPY --chown=keycloak:keycloak ./custom-theme /opt/keycloak/themes/custom-theme
COPY --chown=keycloak:keycloak custom-theme /opt/keycloak/themes/custom-theme

USER root
RUN chmod -R 550 /opt/keycloak/bin/folio
Expand Down
Binary file added libs/folio-scripts.jar
Binary file not shown.

0 comments on commit 9c27294

Please sign in to comment.