Skip to content

Commit e748bfd

Browse files
Copilotcommjoen
andcommitted
Apply same dotnet fix to webdesktopk8s and improve validation
Co-authored-by: commjoen <[email protected]>
1 parent 39dea7b commit e748bfd

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

Dockerfile_webdesktop

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ RUN \
3232

3333
WORKDIR /config/Desktop
3434

35+
# Create directories for copied files
36+
RUN mkdir -p /var/tmp/wrongsecrets /var/tmp/wrongsecrets/decrypt
37+
3538
COPY src/main/resources/executables/*linux-mus* /var/tmp/wrongsecrets/
3639
COPY src/main/resources/executables/decrypt/ /var/tmp/wrongsecrets/decrypt/
3740
COPY src/main/resources/executables/wrongsecrets-advanced-c-windows.exe /var/tmp/wrongsecrets/

Dockerfile_webdesktopk8s

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,14 @@ RUN \
2626
echo "installing dotnet" && \
2727
wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
2828
chmod +x dotnet-install.sh && \
29-
./dotnet-install.sh --install-dir /etc/dotnet --version latest && \
29+
./dotnet-install.sh --install-dir /etc/dotnet --channel 6.0 --version latest && \
30+
rm dotnet-install.sh && \
3031
export DOTNET_ROOT=/etc/dotnet && \
3132
export PATH="/etc/dotnet:/etc/dotnet/tools:$PATH" && \
32-
dotnet --info && \
33-
dotnet tool install ilspycmd --version 9.0.0.7889 --tool-path /etc/dotnet/tools
33+
echo "Checking dotnet installation..." && \
34+
/etc/dotnet/dotnet --info && \
35+
echo "Installing ilspycmd..." && \
36+
/etc/dotnet/dotnet tool install ilspycmd --version 9.0.0.7889 --tool-path /etc/dotnet/tools
3437

3538
# Add a secret using --mount and write it to a specific file path for the challenge
3639
# Create the /app directory to store the secret

0 commit comments

Comments
 (0)