Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,4 @@ node_modules
ui/public/assets/features/.DS_Store

.prettier_cache
.devspace
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ COPY --from=production_build /tmp/wheelhouse /tmp/wheelhouse
COPY --from=production_build /ui_build /ui_build
COPY --from=production_build /docker-entrypoint.sh /docker-entrypoint.sh
COPY --from=production_build /container-init.sh /container-init.sh
COPY --from=pvarki/kw_product_init:latest /kw_product_init /kw_product_init
COPY --from=pvarki/kc_client_init:latest /kc_client_init /kc_client_init
COPY --from=ghcr.io/pvarki/kraftwerk-helper-tool:1.3.0-260513 /kw_product_init /kw_product_init
COPY --from=ghcr.io/pvarki/keycloak-helper-tool:1.1.2-260630 /kc_client_init /kc_client_init
WORKDIR /app
# Install system level deps for running the package (not devel versions for building wheels)
# and install the wheels we built in the previous step. generate default config
Expand Down Expand Up @@ -158,8 +158,8 @@ RUN --mount=type=ssh uv sync \
###########
FROM devel_build as devel_shell
# Copy everything to the image
COPY --from=pvarki/kw_product_init:latest /kw_product_init /kw_product_init
COPY --from=pvarki/kc_client_init:latest /kc_client_init /kc_client_init
COPY --from=ghcr.io/pvarki/kraftwerk-helper-tool:1.3.0-260513 /kw_product_init /kw_product_init
COPY --from=ghcr.io/pvarki/keycloak-helper-tool:1.1.2-260630 /kc_client_init /kc_client_init
WORKDIR /app
RUN apt-get update && apt-get install -y zsh \
&& sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" \
Expand Down
37 changes: 37 additions & 0 deletions devspace.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
version: v2beta1
name: matrix-integration

images:
matrixrmapi:
image: ghcr.io/pvarki/matrix-integration
dockerfile: ./Dockerfile
context: ./
target: devel_shell
skipPush: true
buildKit: {}

pipelines:
dev: |-
build_images --all
start_dev --all

dev:
matrixrmapi:
labelSelector:
app: matrix
namespace: app-matrix
container: matrixrmapi
devImage: ${runtime.images.matrixrmapi}
command:
- /bin/bash
- -lc
- source /container-init.sh && uv sync --frozen && uv run uvicorn --host 0.0.0.0 --port 8012 --log-level debug --factory matrixrmapi.app:get_app --reload
sync:
- path: ./src:/app/src
- path: ./docker:/app/docker
# container-init.sh is provided read-only via the configmap mount
# (/container-init.sh -> /app/docker/container-init.sh symlink), so DevSpace
# can't overwrite it during sync. Skip it; the mounted copy is what runs.
excludePaths:
- container-init.sh
logs: {}
6 changes: 3 additions & 3 deletions docker/container-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ else
fi

if [ "${NGINX_HTTPS_PORT}" == "443" ]; then
export MTLS_BASEURL="mtls.${SERVER_DOMAIN}"
export MTLS_BASEURL="https://mtls.${SERVER_DOMAIN}"
else
export MTLS_BASEURL="mtls.${SERVER_DOMAIN}:${NGINX_HTTPS_PORT}"
export MTLS_BASEURL="https://mtls.${SERVER_DOMAIN}:${NGINX_HTTPS_PORT}"
fi

# Generate the manifest using environment variables
Expand All @@ -32,7 +32,7 @@ cat <<EOF > /tmp/manifest.json
"base_uri": "${MTLS_BASEURL}"
},
"kc": {
"base_uri": "${KCDOMAIN}:9443",
"base_uri": "https://${KCDOMAIN}:9443",
"realm": "${KCREALM}"
}
},
Expand Down
Loading
Loading