Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: update images #1060

Merged
merged 6 commits into from
Mar 17, 2022
Merged

chore: update images #1060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a17157
chore: update persistence-loader image
iromli Mar 15, 2022
8914477
chore: update persistence-loader image
iromli Mar 15, 2022
4fc47b3
chore: update images
iromli Mar 15, 2022
1bf5a30
refactor: unify backend class methods as upgrader methods
iromli Mar 16, 2022
8df0478
chore: sync static and templates for mobile attribute (#1053)
iromli Mar 16, 2022
feea264
refactor: move backend.update_clients_entries to upgrade class
iromli Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docker-jans-auth-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ RUN wget -q https://github.com/fabioz/PyDev.Debugger/archive/refs/tags/pydev_deb
# ===========

ENV CN_VERSION=1.0.0-SNAPSHOT
ENV CN_BUILD_DATE='2022-03-10 11:31'
ENV CN_BUILD_DATE='2022-03-15 17:19'
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 @@ -210,11 +210,11 @@ ENV CN_MAX_RAM_PERCENTAGE=75.0 \
# misc stuff
# ==========

LABEL name="Janssen Authorization Server" \
LABEL name="janssenproject/auth-server" \
maintainer="Janssen Project <support@jans.io>" \
vendor="Janssen Project" \
version="1.0.0" \
release="beta.15" \
release="beta.16" \
summary="Janssen Authorization Server" \
description="OAuth 2.0 server and client; OpenID Connect Provider (OP) & UMA Authorization Server (AS)"

Expand Down
6 changes: 3 additions & 3 deletions docker-jans-certmanager/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN apk update \

# JAR files required to generate OpenID Connect keys
ENV CN_VERSION=1.0.0-SNAPSHOT
ENV CN_BUILD_DATE='2022-03-07 16:25'
ENV CN_BUILD_DATE='2022-03-15 17:18'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-auth-client/${CN_VERSION}/jans-auth-client-${CN_VERSION}-jar-with-dependencies.jar

RUN wget -q ${CN_SOURCE_URL} -P /app/javalibs/
Expand Down Expand Up @@ -133,11 +133,11 @@ ENV CN_WAIT_MAX_TIME=300 \
# misc
# ====

LABEL name="Certmanager" \
LABEL name="janssenproject/certmanager" \
maintainer="Janssen Project <support@jans.io>" \
vendor="Janssen Project" \
version="1.0.0" \
release="b12" \
release="beta.16" \
summary="Janssen Certmanager" \
description="Manage certs and crypto keys for Janssen Server"

Expand Down
12 changes: 5 additions & 7 deletions docker-jans-client-api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apk update \
# ==========

ENV CN_VERSION=1.0.0-SNAPSHOT
ENV CN_BUILD_DATE='2022-03-10 17:03'
ENV CN_BUILD_DATE='2022-03-15 08:49'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-client-api-server/${CN_VERSION}/jans-client-api-server-${CN_VERSION}-distribution.zip

RUN wget -q ${CN_SOURCE_URL} -O /tmp/client-api.zip \
Expand Down Expand Up @@ -134,15 +134,15 @@ ENV CN_MAX_RAM_PERCENTAGE=75.0 \
# misc
# ====

LABEL name="Client API" \
LABEL name="janssenproject/client-api" \
maintainer="Janssen Project <support@jans.io>" \
vendor="Janssen" \
vendor="Janssen Project" \
version="1.0.0" \
release="b12" \
release="beta.16" \
summary="Janssen Client API" \
description="Client software to secure apps with OAuth 2.0, OpenID Connect, and UMA"

RUN mkdir -p /etc/certs /app/templates/ /deploy /etc/jans/conf /opt/client-api/logs
RUN mkdir -p /etc/certs /app/templates/ /etc/jans/conf /opt/client-api/logs
COPY scripts /app/scripts
COPY templates/*.tmpl /app/templates/
RUN chmod +x /app/scripts/entrypoint.sh
Expand All @@ -153,11 +153,9 @@ RUN adduser -s /bin/sh -D -G root -u 1000 1000
# adjust ownership
RUN chown -R 1000:1000 /app/templates \
&& chown -R 1000:1000 /etc/jans \
&& chown -R 1000:1000 /deploy \
&& chown -R 1000:1000 /tmp \
&& chown -R 1000:1000 /opt/client-api \
&& chgrp -R 0 /tmp && chmod -R g=u /tmp \
&& chgrp -R 0 /deploy && chmod -R g=u /deploy \
&& chgrp -R 0 /etc/certs && chmod -R g=u /etc/certs \
&& chgrp -R 0 /etc/jans && chmod -R g=u /etc/jans \
&& chgrp -R 0 /opt/client-api && chmod -R g=u /opt/client-api \
Expand Down
6 changes: 1 addition & 5 deletions docker-jans-client-api/scripts/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
set -e

python3 /app/scripts/wait.py

if [ ! -f /deploy/touched ]; then
python3 /app/scripts/bootstrap.py
touch /deploy/touched
fi
python3 /app/scripts/bootstrap.py

# run the server
# customized `/opt/client-api/bin/client-api-start.sh`
Expand Down
8 changes: 4 additions & 4 deletions docker-jans-config-api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN wget -q https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/${JETTY_
# ==========

ENV CN_VERSION=1.0.0-SNAPSHOT
ENV CN_BUILD_DATE='2022-03-10 11:34'
ENV CN_BUILD_DATE='2022-03-15 20:31'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-config-api-server/${CN_VERSION}/jans-config-api-server-${CN_VERSION}.war

# Install Jans Config API
Expand Down Expand Up @@ -175,11 +175,11 @@ ENV CN_MAX_RAM_PERCENTAGE=75.0 \
# misc
# ====

LABEL name="Config API" \
LABEL name="janssenproject/config-api" \
maintainer="Janssen Project <support@jans.io>" \
vendor="Janssen" \
vendor="Janssen Project" \
version="1.0.0" \
release="beta.15" \
release="beta.16" \
summary="Janssen Config API" \
description=""

Expand Down
10 changes: 5 additions & 5 deletions docker-jans-configurator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN apk update \

# JAR files required to generate OpenID Connect keys
ENV CN_VERSION=1.0.0-SNAPSHOT
ENV CN_BUILD_DATE='2022-03-07 16:25'
ENV CN_BUILD_DATE='2022-03-15 17:18'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-auth-client/${CN_VERSION}/jans-auth-client-${CN_VERSION}-jar-with-dependencies.jar

RUN wget -q ${CN_SOURCE_URL} -P /app/javalibs/
Expand Down Expand Up @@ -110,11 +110,11 @@ ENV CN_WAIT_MAX_TIME=300 \
# misc
# ====

LABEL name="configurator" \
maintainer="Janssen <support@jans.io>" \
vendor="Janssen" \
LABEL name="janssenproject/configurator" \
maintainer="Janssen Project <support@jans.io>" \
vendor="Janssen Project" \
version="1.0.0" \
release="b12" \
release="beta.16" \
summary="Janssen Configuration Manager" \
description="Manage config and secret"

Expand Down
8 changes: 4 additions & 4 deletions docker-jans-fido2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ EXPOSE 8080
# =====

ENV CN_VERSION=1.0.0-SNAPSHOT
ENV CN_BUILD_DATE='2022-03-10 08:13'
ENV CN_BUILD_DATE='2022-03-15 17:18'
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 Expand Up @@ -149,11 +149,11 @@ ENV CN_MAX_RAM_PERCENTAGE=75.0 \
# misc stuff
# ==========

LABEL name="FIDO2" \
maintainer="Janssen io <support@jans.io>" \
LABEL name="janssenproject/fido2" \
maintainer="Janssen Project <support@jans.io>" \
vendor="Janssen Project" \
version="1.0.0" \
release="beta.15" \
release="beta.16" \
summary="Janssen FIDO2" \
description="FIDO2 server"

Expand Down
8 changes: 4 additions & 4 deletions docker-jans-persistence-loader/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN pip3 install -U pip wheel \
# jans-linux-setup sync
# =====================

ENV JANS_LINUX_SETUP_VERSION=452ce0fc0132f6ac7fd3be4a20bab560b1586dea
ENV JANS_LINUX_SETUP_VERSION=5b7fd274230c160d470ef76495d333cab1ae3b2a
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup

# note that as we're pulling from a monorepo (with multiple project in it)
Expand Down Expand Up @@ -169,11 +169,11 @@ ENV CN_CACHE_TYPE=NATIVE_PERSISTENCE \
# misc
# ====

LABEL name="Persistence" \
maintainer="Janssen <support@jans.io>" \
LABEL name="janssenproject/persistence-loader" \
maintainer="Janssen Project <support@jans.io>" \
vendor="Janssen Project" \
version="1.0.0" \
release="beta.15" \
release="beta.16" \
summary="Janssen Authorization Server Persistence loader" \
description="Generate initial data for persistence layer"

Expand Down
1 change: 1 addition & 0 deletions docker-jans-persistence-loader/scripts/spanner_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,7 @@ def column_from_array(table_name, col_name):
("jansClnt", "jansDefAcrValues"),
("jansClnt", "jansLogoutURI"),
("jansPerson", "role"),
("jansPerson", "mobile"),
]:
column_to_array(mod[0], mod[1])

Expand Down
1 change: 1 addition & 0 deletions docker-jans-persistence-loader/scripts/sql_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@ def column_from_json(table_name, col_name):
("jansClnt", "jansDefAcrValues"),
("jansClnt", "jansLogoutURI"),
("jansPerson", "role"),
("jansPerson", "mobile"),
]:
column_to_json(mod[0], mod[1])

Expand Down
Loading