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 +14 -9
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0d24b0fb02 - Show all commits

3
podman/Dockerfile
View File

@ -1,7 +1,7 @@
FROM "ubuntu:22.04"
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"]
WORKDIR /usr
WORKDIR /tmp
cody marked this conversation as resolved Outdated
cody commented 2025-01-08 19:35:17 +00:00
Outdated
Review
Copy Link

For temporary working spaces to compile programs it would be preferable to use /tmp or $HOME instead of /usr to conform to normal *NIX conventions.

For temporary working spaces to compile programs it would be preferable to use `/tmp` or `$HOME` instead of `/usr` to conform to normal *NIX conventions.
RUN apt update && /usr/scripts/make_gcc.sh
WORKDIR /usr/scripts
@ -12,6 +12,7 @@ ADD ["scripts/install_pop-fe.sh", "scripts/run_pop_fe.sh", "/usr/scripts"]
WORKDIR /usr/jaby_engine/bin/extern
RUN apt update && /usr/scripts/install_pop-fe.sh
WORKDIR /project
ENV PATH="/jaby_engine/bin:/root/.cargo/bin:${PATH}"
ENV JABY_ENGINE_PATH=/jaby_engine
ENV JABY_ENGINE_DIR=/jaby_engine
cody marked this conversation as resolved Outdated
cody commented 2025-01-08 19:37:14 +00:00
Outdated
Review
Copy Link

Never set workdir to /jaby_engine or some other potentially useful directory? is it intended to be in /user/jaby_engine/bin/extern?

Never set workdir to `/jaby_engine` or some other potentially useful directory? is it intended to be in `/user/jaby_engine/bin/extern`?

18
podman/install.sh
View File

@ -2,12 +2,16 @@
podman build -t jaby_engine .
if [[ -z "${JABY_ENGINE_PATH}" ]]; then
echo "Setting JABY_ENGINE_PATH to parent folder"
echo "Setting JABY_ENGINE_PATH to parent folder"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
JABY_ENGINE_PATH="$(dirname "$SCRIPT_DIR")"
cat << End >> ~/.profile
export JABY_ENGINE_PATH="$JABY_ENGINE_PATH"
End
source ~/.profile
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export JABY_ENGINE_PATH="$(dirname "$SCRIPT_DIR")"
if cat /etc/passwd | grep $USER | grep bash > /dev/null; then
cody marked this conversation as resolved Outdated
cody commented 2025-01-08 19:42:54 +00:00
Outdated
Review
Copy Link

This will not work as expected on any distro that does not use bash by default. You could echo an example of what to add to your "bashrc" and let users add it to the correct rc file for their shell.

This will not work as expected on any distro that does not use bash by default. You could echo an example of what to add to your "bashrc" and let users add it to the correct rc file for their shell.
cody commented 2025-01-08 19:50:47 +00:00
Outdated
Review
Copy Link

for example

echo "Please ensure that you source ~/.profile in your shell rc"

so that people with alternate shells will still be able to use your tools.

for example ``` echo "Please ensure that you source ~/.profile in your shell rc" ``` so that people with alternate shells will still be able to use your tools.
cody commented 2025-01-08 20:00:53 +00:00
Outdated
Review
Copy Link

or use

if cat /etc/passwd | grep $USER | grep bash; then
# do stuff if they use bash
else
# warn the users then need to add the export statement to their shell RC
fi
or use ```bash if cat /etc/passwd | grep $USER | grep bash; then # do stuff if they use bash else # warn the users then need to add the export statement to their shell RC fi ```
# Bash found
echo "export JABY_ENGINE_PATH="$JABY_ENGINE_PATH"" >> ~/.bashrc
else
# No bash found
echo "Please add export JABY_ENGINE_PATH="$JABY_ENGINE_PATH" to your shell profile"
fi
fi

2
podman/scripts/make_gcc.sh
View File

@ -61,5 +61,5 @@ if [ $? -ne 0 ]; then
fi
echo "<<< Delete GCC folder >>>"
cd /usr
cd /tmp
rm -fr psx-gcc