jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Support for podman #9

Merged
jaby merged 25 commits from feature/jb/potman into main 2025-01-08 21:22:17 +00:00
Conversation 0 Commits 25 Files Changed 30 +7 -3
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 819558cf9d - Show all commits

2
examples/PoolBox/PoolBox.code-workspace
View File

@ -20,7 +20,7 @@
{ {
"label": "read memory map", "label": "read memory map",
"type": "shell", // TODO: Make this work again? Or remove it and just tell people how to use it? Does not work with docker...? "type": "shell", // TODO: Make this work again? Or remove it and just tell people how to use it? Does not work with docker...?
"command": "${env:JABY_ENGINE_PATH}/scripts/podman_jaby_engine.sh ${workspaceFolder} . psxreadmap ${input:output memory map} application/bin/PAL/PSX-${input:build profile}/PoolBox.elf", "command": "${env:JABY_ENGINE_PATH}/bin/psxreadmap ${input:output memory map} application/bin/PAL/PSX-${input:build profile}/PoolBox.elf",
"problemMatcher": [], "problemMatcher": [],
} }
], ],

2
podman/Dockerfile
View File

@ -1,4 +1,4 @@
FROM "ubuntu:24.04" FROM "ubuntu:22.04"
WORKDIR /usr/scripts WORKDIR /usr/scripts
cody marked this conversation as resolved
cody commented 2025-01-08 19:35:33 +00:00
Review
Copy Link

Potentially not needed?

Potentially not needed?
ADD ["scripts/make_gcc.sh", "/usr/scripts"] ADD ["scripts/make_gcc.sh", "/usr/scripts"]
WORKDIR /usr WORKDIR /usr

6
scripts/podman_jaby_engine.sh
View File

@ -1,4 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
JABY_ENGINE_DOT_FOLDER="$HOME/.jaby_engine"
JABY_ENGINE_CARGO_FOLDER="$JABY_ENGINE_DOT_FOLDER/cargo/registry"
cody marked this conversation as resolved
cody commented 2025-01-08 20:03:11 +00:00
Review
Copy Link

Can you directly map it to the local system cargo registry? does this potentially cause any problems?

Can you directly map it to the local system cargo registry? does this potentially cause any problems?
jaby commented 2025-01-08 21:12:53 +00:00
Review
Copy Link

I leave this unchanged for now.
I need to figure out first if this is really an issue

I leave this unchanged for now. I need to figure out first if this is really an issue
if [[ -n "${PSX_LICENSE_PATH}" ]]; then if [[ -n "${PSX_LICENSE_PATH}" ]]; then
LICENSE_MOUNT="-v ${PSX_LICENSE_PATH}:/psx_license" LICENSE_MOUNT="-v ${PSX_LICENSE_PATH}:/psx_license"
else else
@ -9,4 +12,5 @@ PROJECT_PATH=$1
PROJECT_WORK_DIR=$2 PROJECT_WORK_DIR=$2
shift shift
shift shift
podman run --rm -it -v ${JABY_ENGINE_PATH}:/jaby_engine -v ${PROJECT_PATH}:/project $LICENSE_MOUNT -w /project/$PROJECT_WORK_DIR jaby_engine $@ mkdir -p $JABY_ENGINE_CARGO_FOLDER
podman run --rm -it -v $JABY_ENGINE_CARGO_FOLDER:/root/.cargo/registry -v ${JABY_ENGINE_PATH}:/jaby_engine -v ${PROJECT_PATH}:/project $LICENSE_MOUNT -w /project/$PROJECT_WORK_DIR jaby_engine $@