Skip to content

Commit 2bc619f

Browse files
Copilotcommjoen
andcommitted
Fix workflow failures by removing inconsistent secret mounts from webdesktopk8s
Co-authored-by: commjoen <[email protected]>
1 parent 4e6ad25 commit 2bc619f

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

.github/workflows/pr-desktop-containers.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ jobs:
9292
type=ref,event=pr,suffix=-{{sha}}
9393
type=ref,event=pr
9494
95-
- name: Create secret file for build
96-
run: |
97-
echo "wrongsecret-3" > /tmp/mysecret.txt
98-
9995
- name: Build and push Docker image
10096
id: build
10197
uses: docker/build-push-action@v6
@@ -108,8 +104,6 @@ jobs:
108104
labels: ${{ steps.meta.outputs.labels }}
109105
build-args: |
110106
argBasedVersion=${{ steps.extract-version.outputs.docker_version }}
111-
secrets: |
112-
mysecret=/tmp/mysecret.txt
113107
cache-from: type=gha,scope=${{ matrix.container.name }}-pr
114108
cache-to: type=gha,mode=max,scope=${{ matrix.container.name }}-pr
115109

Dockerfile_webdesktopk8s

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,11 @@ RUN \
3535
echo "Installing ilspycmd..." && \
3636
/etc/dotnet/dotnet tool install ilspycmd --version 9.0.0.7889 --tool-path /etc/dotnet/tools
3737

38-
# Add a secret using --mount and write it to a specific file path for the challenge
39-
# Create the /app directory to store the secret
40-
RUN mkdir -p /app
41-
42-
# Use a separate RUN command for --mount
43-
RUN --mount=type=secret,id=mysecret \
44-
export SECRET_VALUE=$(cat /run/secrets/mysecret) && \
45-
echo $SECRET_VALUE >> /app/secret.txt
46-
4738
WORKDIR /config/Desktop
4839

40+
# Create directories for copied files
41+
RUN mkdir -p /var/tmp/wrongsecrets /var/tmp/wrongsecrets/decrypt
42+
4943
COPY src/main/resources/executables/*linux-mus* /var/tmp/wrongsecrets/
5044
COPY src/main/resources/executables/decrypt/ /var/tmp/wrongsecrets/decrypt/
5145
COPY src/main/resources/executables/wrongsecrets-advanced-c-windows.exe /var/tmp/wrongsecrets/

0 commit comments

Comments
 (0)