Skip to content

Commit

Permalink
Corrected all paths to use native Gel paths.
Browse files Browse the repository at this point in the history
  • Loading branch information
@PoneyClairDeLune
PoneyClairDeLune committed Feb 8, 2024
1 parent 9f96b98 commit 0704459
Show file tree
Hide file tree
Showing 16 changed files with 56 additions and 49 deletions.
2 changes: 1 addition & 1 deletion build_version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024m04a
2024m04b
2 changes: 1 addition & 1 deletion sh/buildAll.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ shx build alpine
shx build debian
shx build opensuse
shx build rocky
shx build fedora
#shx build fedora
shx build slimdeb
shx build slimsuse
exit
12 changes: 6 additions & 6 deletions src/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ WORKDIR /root

# Copy and run
COPY ./shared/etc/ /etc/
COPY ./shared/sh/ /root/sh/shared
COPY ./shared/sh/ /root/gel/shared/sh
COPY ./etc/ /etc/
COPY ./sh/ /root/sh/distro
RUN sh /root/sh/distro/init.sh
RUN bash /root/sh/shared/setup.sh
RUN bash /root/sh/distro/setup.sh
RUN bash /root/sh/shared/post.sh
COPY ./sh/ /root/gel/distro/sh
RUN sh /root/gel/distro/sh/init.sh
RUN bash /root/gel/shared/sh/setup.sh
RUN bash /root/gel/distro/sh/setup.sh
RUN bash /root/gel/shared/sh/post.sh

# Run forever
EXPOSE 1122
Expand Down
2 changes: 1 addition & 1 deletion src/alpine/sh/setup.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
cd /root/sh/distro
cd /root/gel/distro/sh
sed -i "s/__FLAVOUR__/Alpine/g" $PREFIX/etc/motd
bash install.sh
exit
10 changes: 5 additions & 5 deletions src/debian/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ WORKDIR /root

# Copy and run
COPY ./shared/etc/ /etc/
COPY ./shared/sh/ /root/sh/shared
COPY ./shared/sh/ /root/gel/shared/sh
COPY ./etc/ /etc/
COPY ./sh/ /root/sh/distro
RUN bash /root/sh/shared/setup.sh
RUN bash /root/sh/distro/setup.sh
RUN bash /root/sh/shared/post.sh
COPY ./sh/ /root/gel/distro/sh
RUN bash /root/gel/shared/sh/setup.sh
RUN bash /root/gel/distro/sh/setup.sh
RUN bash /root/gel/shared/sh/post.sh

# Run forever
EXPOSE 1122
Expand Down
2 changes: 1 addition & 1 deletion src/debian/sh/setup.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
cd /root/sh/distro
cd ~root/gel/distro/sh
sed -i "s/__FLAVOUR__/Debian/g" $PREFIX/etc/motd
bash install.sh
apt clean
Expand Down
12 changes: 6 additions & 6 deletions src/fedora/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ WORKDIR /root

# Copy and run
COPY ./shared/etc/ /etc/
COPY ./shared/sh/ /root/sh/shared
COPY ./shared/sh/ /root/gel/shared/sh
COPY ./etc/ /etc/
COPY ./sh/ /root/sh/distro
RUN bash /root/sh/distro/init.sh
RUN bash /root/sh/shared/setup.sh
RUN bash /root/sh/distro/setup.sh
RUN bash /root/sh/shared/post.sh
COPY ./sh/ /root/gel/distro/sh
RUN bash /root/gel/distro/sh/init.sh
RUN bash /root/gel/shared/sh/setup.sh
RUN bash /root/gel/distro/sh/setup.sh
RUN bash /root/gel/shared/sh/post.sh

# Run forever
EXPOSE 1122
Expand Down
12 changes: 6 additions & 6 deletions src/opensuse/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ WORKDIR /root

# Copy and run
COPY ./shared/etc/ /etc/
COPY ./shared/sh/ /root/sh/shared
COPY ./shared/sh/ /root/gel/shared/sh
COPY ./etc/ /etc/
COPY ./sh/ /root/sh/distro
RUN bash /root/sh/distro/init.sh
RUN bash /root/sh/shared/setup.sh
RUN bash /root/sh/distro/setup.sh
RUN bash /root/sh/shared/post.sh
COPY ./sh/ /root/gel/distro/sh
RUN bash /root/gel/distro/sh/init.sh
RUN bash /root/gel/shared/sh/setup.sh
RUN bash /root/gel/distro/sh/setup.sh
RUN bash /root/gel/shared/sh/post.sh

# Run forever
EXPOSE 1122
Expand Down
2 changes: 1 addition & 1 deletion src/opensuse/sh/setup.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
cd /root/sh/distro
cd ~root/gel/distro/sh
sed -i "s/__FLAVOUR__/openSUSE/g" $PREFIX/etc/motd
bash install.sh
zypper clean
Expand Down
12 changes: 6 additions & 6 deletions src/rocky/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ WORKDIR /root

# Copy and run
COPY ./shared/etc/ /etc/
COPY ./shared/sh/ /root/sh/shared
COPY ./shared/sh/ /root/gel/shared/sh
COPY ./etc/ /etc/
COPY ./sh/ /root/sh/distro
RUN bash /root/sh/distro/init.sh
RUN bash /root/sh/shared/setup.sh
RUN bash /root/sh/distro/setup.sh
RUN bash /root/sh/shared/post.sh
COPY ./sh/ /root/gel/distro
RUN bash /root/gel/distro/sh/init.sh
RUN bash /root/gel/shared/sh/setup.sh
RUN bash /root/gel/distro/sh/setup.sh
RUN bash /root/gel/shared/sh/post.sh

# Run forever
EXPOSE 1122
Expand Down
2 changes: 1 addition & 1 deletion src/rocky/sh/setup.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
cd ~root/gel/distro/sh
sed -i "s/__FLAVOUR__/Rocky Linux/g" $PREFIX/etc/motd
bash init.sh
#bash init.sh
bash install.sh
#dnf clean dbcache
dnf clean all
Expand Down
9 changes: 8 additions & 1 deletion src/shared/sh/native.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,15 @@ cp -rv distro/etc/* /etc/
echo "Running shared setup scripts..."
cd shared/sh
bash setup.sh
echo "Running distro setup scripts..."
echo "Preparing distro..."
cd ../../distro/sh
if [ -f "./init.sh" ] ; then
echo "Running distro init scripts..."
bash init.sh
else
echo "Init script not provided. Skipping..."
fi
echo "Running distro setup scripts..."
bash setup.sh
if [ -f "./native.sh" ] ; then
echo "Running native setup scripts..."
Expand Down
10 changes: 5 additions & 5 deletions src/slimdeb/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ WORKDIR /root

# Copy and run
COPY ./shared/etc/ /etc/
COPY ./shared/sh/ /root/sh/shared
COPY ./shared/sh/ /root/gel/shared/sh
COPY ./etc/ /etc/
COPY ./sh/ /root/sh/distro
RUN bash /root/sh/shared/setup.sh
RUN bash /root/sh/distro/setup.sh
RUN bash /root/sh/shared/post.sh
COPY ./sh/ /root/gel/distro/sh
RUN bash /root/gel/shared/sh/setup.sh
RUN bash /root/gel/distro/sh/setup.sh
RUN bash /root/gel/shared/sh/post.sh

# Run forever
EXPOSE 1122
Expand Down
2 changes: 1 addition & 1 deletion src/slimdeb/sh/setup.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
cd /root/sh/distro
cd ~root/gel/distro/sh
sed -i "s/__FLAVOUR__/Debian Slim/g" $PREFIX/etc/motd
bash install.sh
apt clean
Expand Down
12 changes: 6 additions & 6 deletions src/slimsuse/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ WORKDIR /root

# Copy and run
COPY ./shared/etc/ /etc/
COPY ./shared/sh/ /root/sh/shared
COPY ./shared/sh/ /root/gel/shared/sh
COPY ./etc/ /etc/
COPY ./sh/ /root/sh/distro
RUN bash /root/sh/distro/init.sh
RUN bash /root/sh/shared/setup.sh
RUN bash /root/sh/distro/setup.sh
RUN bash /root/sh/shared/post.sh
COPY ./sh/ /root/gel/distro/sh
RUN bash /root/gel/distro/sh/init.sh
RUN bash /root/gel/shared/sh/setup.sh
RUN bash /root/gel/distro/sh/setup.sh
RUN bash /root/gel/shared/sh/post.sh

# Run forever
EXPOSE 1122
Expand Down
2 changes: 1 addition & 1 deletion src/slimsuse/sh/setup.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
cd /root/sh/distro
cd ~root/gel/distro/sh
sed -i "s/__FLAVOUR__/openSUSE/g" $PREFIX/etc/motd
bash install.sh
bash cleanup.sh
Expand Down

0 comments on commit 0704459

Please sign in to comment.