Skip to content

Commit

Permalink
fix: update external modules for otp/fido2 (#1589)
Browse files Browse the repository at this point in the history
  • Loading branch information
iromli authored Jun 22, 2022
1 parent b2e3eb3 commit fc42181
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions docker-jans-auth-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ RUN /opt/jython/bin/pip uninstall -y pip
# ===========

ENV CN_VERSION=1.0.1-SNAPSHOT
ENV CN_BUILD_DATE='2022-06-16 08:14'
ENV CN_BUILD_DATE='2022-06-22 08:14'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-auth-server/${CN_VERSION}/jans-auth-server-${CN_VERSION}.war

# Install Jans Auth
Expand Down Expand Up @@ -90,15 +90,15 @@ RUN wget -q https://jenkins.gluu.org/maven/org/gluu/casa-config/${CASA_CONFIG_VE
# Casa external scripts
# =====================

ARG FLEX_SOURCE_VERSION=fe01bcb3d46311355b15a37b655253ca17997358
ARG FLEX_SOURCE_VERSION=87276ada2aa5004941e3fd6cc55833f5153f8254
ARG CASA_EXTRAS_DIR=casa/extras

RUN mkdir -p /opt/jans/python/libs
RUN git clone --filter blob:none --no-checkout https://github.com/GluuFederation/flex.git /tmp/flex \
&& cd /tmp/flex \
&& git sparse-checkout init --cone \
&& git checkout ${FLEX_SOURCE_VERSION} \
&& git sparse-checkout set ${CASA_EXTRAS_DIR} \
&& git sparse-checkout add ${CASA_EXTRAS_DIR} \
&& cd /opt/jans/python/libs \
&& cp /tmp/flex/${CASA_EXTRAS_DIR}/casa-external_* . \
&& rm -rf /tmp/flex
Expand Down Expand Up @@ -286,7 +286,8 @@ RUN chmod -R g=u ${JETTY_BASE}/jans-auth/custom \
&& chmod 664 /usr/java/latest/jre/lib/security/cacerts \
&& chmod 664 /opt/jetty/etc/jetty.xml \
&& chmod 664 /opt/jetty/etc/webdefault.xml \
&& chown -R 1000:0 ${JETTY_BASE}/jans-auth/agama
&& chown -R 1000:0 ${JETTY_BASE}/jans-auth/agama \
&& chown -R 1000:0 /opt/jans/python/libs

USER 1000

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-fido2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ EXPOSE 8080
# =====

ENV CN_VERSION=1.0.1-SNAPSHOT
ENV CN_BUILD_DATE='2022-06-06 08:13'
ENV CN_BUILD_DATE='2022-06-22 08:13'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-fido2-server/${CN_VERSION}/jans-fido2-server-${CN_VERSION}.war

# Install FIDO2
Expand Down

0 comments on commit fc42181

Please sign in to comment.