Skip to content

Commit

Permalink
tweaking; see if shakes cloud build fails out
Browse files Browse the repository at this point in the history
  • Loading branch information
dudleycodes committed Aug 28, 2023
1 parent 3ca7a66 commit 9ffc964
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
1 change: 1 addition & 0 deletions dist/linux/ll-tests/gamesvr-cssource.sh
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ should_lack 'Please install (lib32tinfo5 / ncurses-libs.i686 / equivalent) to en
should_have 'server_srv.so loaded for "Counter-Strike: Source"' 'srcds_run loaded CS:Source';
should_have 'Server is hibernating' 'srcds_run succesfully hibernated';
should_echo "sv_cheats" '"sv_cheats" = "0"';
should_lack "Warning: failed to init SDL thread priority manager: SDL not found" 'SDL thread priority manager is not missing';
#####################################################################################################
#####################################################################################################

Expand Down
17 changes: 8 additions & 9 deletions linux.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ COPY /build-cache /output
# Download Counter-Strike: Source
RUN /app/steamcmd.sh +force_install_dir /output +login anonymous +app_update 232330 validate +quit;

COPY ./dist/linux/ll-tests /output/ll-tests

#=======================================================================
FROM debian:bookworm-slim

Expand All @@ -17,7 +19,7 @@ HEALTHCHECK NONE

RUN dpkg --add-architecture i386 &&`
apt-get update && apt-get install -y `
ca-certificates lib32gcc-s1 libncurses5:i386 libstdc++6 libstdc++6:i386 locales locales-all tmux &&`
ca-certificates lib32gcc-s1 libncurses5:i386 libsdl2-2.0-0:i386 libstdc++6 libstdc++6:i386 locales locales-all tmux &&`
apt-get clean &&`
rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/*;

Expand All @@ -33,21 +35,18 @@ LABEL com.lacledeslan.build-node=$BUILDNODE `

# Set up Enviornment
RUN useradd --home /app --gid root --system CSSource &&`
mkdir -p /app/ll-tests &&`
mkdir --parents /app &&`
chown CSSource:root -R /app;

COPY --chown=CSSource:root --from=cssource-builder /output /app

COPY --chown=CSSource:root dist/linux/ll-tests /app/ll-tests

RUN chmod +x /app/ll-tests/*.sh;

USER CSSource

RUN echo $'\n\nLinking steamclient.so to prevent srcds_run errors' &&`
RUN chmod +x /app/ll-tests/*.sh &&`
echo $'\n\nLinking steamclient.so to prevent srcds_run errors' &&`
mkdir --parents /app/.steam/sdk32 &&`
ln -s /app/bin/steamclient.so /app/.steam/sdk32/steamclient.so

USER CSSource

WORKDIR /app

CMD ["/bin/bash"]
Expand Down

0 comments on commit 9ffc964

Please sign in to comment.