Skip to content

Feat(#755): no podman, just upgrading the container #758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

Feat(#755): no podman, just upgrading the container #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7585a91
Feat(#755): initial test setup to get podman
commjoen Apr 10, 2023
7e94df4
Feat(#755): initial almost working podman container with much newer a…
commjoen Apr 10, 2023
19d3aa5
feat(#755): no more podman as it requieres privileges
commjoen Apr 10, 2023
63aaf5e
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Apr 10, 2023
5d2d1da
Initial testing with new virtual desktop
commjoen Apr 11, 2023
7e0e370
Merge branch 'master' into feat-755-podman
commjoen Apr 12, 2023
902bd32
Merge branch 'master' into feat-755-podman
commjoen Apr 13, 2023
edfe3ab
Merge branch 'master' into feat-755-podman
commjoen May 19, 2023
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
5 changes: 2 additions & 3 deletions Dockerfile_webdesktop
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM lscr.io/linuxserver/webtop:4.16-r0-ls72
FROM linuxserver/webtop:latest
LABEL NAME="OWASP WrongSecrets Web Desktop" MAINTAINER="Jeroen Willemsen"

RUN \
Expand All @@ -24,6 +24,5 @@ COPY src/test/resources/alibabacreds.kdbx /var/tmp/helpers/
COPY src/test/resources/alibabacreds.kdbx /var/tmp/wrongsecrets/
COPY wrongsecret-desktop-resources/welcome.md /var/tmp/wrongsecrets/

RUN sudo chown abc /var/tmp/wrongsecrets

COPY wrongsecret-desktop-resources/startwm.sh /defaults/startwm.sh
RUN echo -e "sudo chown abc /config/Desktop && cp -r /var/tmp/wrongsecrets /var/tmp/wrongsecrets/welcome.md /config/Desktop/\n$(cat /defaults/startwm.sh)" > /defaults/startwm.sh
6 changes: 2 additions & 4 deletions Dockerfile_webdesktopk8s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM lscr.io/linuxserver/webtop:4.16-r0-ls72
FROM linuxserver/webtop:latest
LABEL NAME="OWASP WrongSecrets Web Desktop" MAINTAINER="Jeroen Willemsen"

RUN \
Expand Down Expand Up @@ -31,6 +31,4 @@ COPY src/test/resources/alibabacreds.kdbx /var/tmp/wrongsecrets/
COPY wrongsecret-desktop-resources/welcome.md /var/tmp/wrongsecrets/


RUN sudo chown abc /var/tmp/wrongsecrets

COPY wrongsecret-desktop-resources/startwm.sh /defaults/startwm.sh
RUN echo -e "sudo chown abc /config/Desktop && cp -r /var/tmp/wrongsecrets /var/tmp/wrongsecrets/welcome.md /config/Desktop/\n$(cat /defaults/startwm.sh)" > /defaults/startwm.sh