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
3 changes: 3 additions & 0 deletions dockerfiles/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ variable VERSIONS {
KTLS_UTILS = "1.2.1-1"
# renovate: type=deb url=https://packages.linbit.com/public?suite=bookworm&components=misc&binaryArch=amd64 depName=linstor-common
LINSTOR = "1.32.3-1"
# renovate: type=deb url=https://packages.linbit.com/public?suite=bookworm&components=misc&binaryArch=amd64 depName=linstor-gui
LINSTOR_GUI = "1.9.10-1"
}
}

Expand Down Expand Up @@ -100,6 +102,7 @@ target "piraeus-server" {
contexts = { base = "target:base" }
args = {
LINSTOR_VERSION = VERSIONS["LINSTOR"]
LINSTOR_GUI_VERSION = VERSIONS["LINSTOR_GUI"]
K8S_AWAIT_ELECTION_VERSION = VERSIONS["K8S_AWAIT_ELECTION"]
}
}
Expand Down
3 changes: 2 additions & 1 deletion dockerfiles/piraeus-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM base

ARG LINSTOR_VERSION=*
ARG LINSTOR_GUI_VERSION=*
RUN --mount=type=cache,target=/var/cache,sharing=private \
--mount=type=cache,target=/var/lib/apt/lists,sharing=private \
--mount=type=tmpfs,target=/var/log \
Expand Down Expand Up @@ -40,7 +41,7 @@ RUN --mount=type=cache,target=/var/cache,sharing=private \
&& \
# remove udev, no need for it in the container \
apt-get remove -y udev && \
apt-get install -y linstor-controller=$LINSTOR_VERSION linstor-satellite=$LINSTOR_VERSION linstor-common=$LINSTOR_VERSION linstor-client linstor-gui
apt-get install -y linstor-controller=$LINSTOR_VERSION linstor-satellite=$LINSTOR_VERSION linstor-common=$LINSTOR_VERSION linstor-gui=$LINSTOR_GUI_VERSION linstor-client

# Log directory need to be group writable. OpenShift assigns random UID and GID, without extra RBAC changes we can only influence the GID.
RUN mkdir /var/log/linstor-controller && \
Expand Down
Loading