Merge branch 'feature/KASM-5438-fix-vnc-kasm-recorder-upload-and-termination-issues-on-certain-distros' into 'develop'

Resolve KASM-5438 "Feature/ fix vnc kasm recorder upload and termination issues on certain distros"

Closes KASM-5438

See merge request kasm-technologies/internal/workspaces-core-images!165
This commit is contained in:
Justin Travis 2024-01-23 03:48:08 +00:00
commit 93f423924f
2 changed files with 2 additions and 1 deletions

View File

@ -98,6 +98,7 @@ COPY ./src/ubuntu/install/printer/resources/*.ppd /etc/cups/ppd/
### Install Recorder Service
COPY ./src/ubuntu/install/recorder $INST_SCRIPTS/recorder/
RUN bash $INST_SCRIPTS/recorder/install_recorder.sh && rm -rf $INST_SCRIPTS/recorder
RUN apk add --no-cache coreutils # the timeout function used by the backend needs to be the one from core utils.
### Copy built Squid
COPY --from=squid_builder /usr/local/squid /usr/local/squid

View File

@ -12,7 +12,7 @@ elif [ "${DISTRO}" == "opensuse" ]; then
zypper install -ny xhost
fi
COMMIT_ID="a871bde8bf4e209ab2a2b2022c3f0ab36f1319be"
COMMIT_ID="b906f7dd511b43ff97bfb290a9dc35761453453f"
BRANCH="main"
COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)