crims0n
/
minios-live
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

adding docker support

master
crims0n 4 years ago
parent
1f197e6b29
commit
4c8d33b250
9 changed files with 617 additions and 262 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      docker/01-runme.sh
  2. 3
      docker/02-build.sh
  3. 5
      docker/Dockerfile.py
  4. 5
      linux-live/basesystem/01-core/install
  5. 2
      linux-live/config
  6. 843
      linux-live/minioslib
  7. 4
      linux-live/modules/02-xorg/install
  8. 9
      linux-live/modules/03-desktop/install
  9. 4
      linux-live/modules/04-apps/install

4
docker/01-runme.sh
View File

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# Several packages need to be installed to use Dockerfile.py # Several packages need to be installed to use Dockerfile.py
# It creates a local container that you can use to build minios-live # It creates a local container that you can use to build minios-live
apt install python3-pip apt install -y docker.io python3-pip
systemctl start docker
systemctl enable docker
pip3 install pydocker pip3 install pydocker
python3 ./Dockerfile.py python3 ./Dockerfile.py

3
docker/02-build.sh
View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
#docker run -d --name mlc --privileged -v /build:/build local/mlc /build/slax/autoinstall - #docker run -d --name mlc --privileged -v /build:/build local/mlc /build/slax/autoinstall -
docker run --rm -it --privileged -v /build:/build local/mlc /build/slax/autoinstall build_modules_chroot - docker run --rm -it --privileged -v /build:/build local/mlc /build/slax/autoinstall -
#docker run --rm -it --privileged -v /build:/build local/mlc /build/slax/autoinstall build_modules_chroot -
#docker run -it --name mlc --privileged -v /build:/build local/mlc #docker run -it --name mlc --privileged -v /build:/build local/mlc
#docker run -d --name mlc --privileged -v /build:/build local/mlc #docker run -d --name mlc --privileged -v /build:/build local/mlc

5
docker/Dockerfile.py
View File

@ -12,8 +12,9 @@ logging.root.addHandler(logging.StreamHandler(sys.stdout))
class DockerFile(pydocker.DockerFile): class DockerFile(pydocker.DockerFile):
""" add here your custom features """ """ add here your custom features """
#d = DockerFile(base_img='ubuntu:focal', name='crims0n/minios-live-container:latest') d = DockerFile(base_img='ubuntu:focal', name='crims0n/minios-live-container:latest')
d = DockerFile(base_img='ubuntu:focal', name='local/mlc:latest') #d = DockerFile(base_img='ubuntu:bionic', name='local/mlc:latest')
#d = DockerFile(base_img='debian:buster', name='local/mlc:latest')
d.RUN_bash_script('/opt/install.sh', r''' d.RUN_bash_script('/opt/install.sh', r'''
touch /.minios-live-container touch /.minios-live-container

5
linux-live/basesystem/01-core/install
View File

@ -13,7 +13,4 @@ if [ -f $SCRIPT_DIR/package.list ]; then
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \ $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
$(grep -vE "^\s*#" $SCRIPT_DIR/package.list | tr "\n" " ") >>$OUTPUT 2>&1 $(grep -vE "^\s*#" $SCRIPT_DIR/package.list | tr "\n" " ") >>$OUTPUT 2>&1
fi fi
chown live.users /home/live
chown -R live.users /home/live

2
linux-live/config
View File

@ -34,7 +34,7 @@ DISTRIBUTION_VARIANT="minbase"
DISTRIBUTION_URL="http://ftp.ru.debian.org/debian/" DISTRIBUTION_URL="http://ftp.ru.debian.org/debian/"
# #
COMP_TYPE="xz" COMP_TYPE="lz4"
# Kernel file, will be copied to your Live Kit # Kernel file, will be copied to your Live Kit
# Your kernel must support aufs and squashfs. Debian Jessie's kernel is ready # Your kernel must support aufs and squashfs. Debian Jessie's kernel is ready

843
linux-live/minioslib
View File

File diff suppressed because it is too large

4
linux-live/modules/02-xorg/install
View File

@ -17,5 +17,5 @@ if [ -f $SCRIPT_DIR/package.list ]; then
$(grep -vE "^\s*#" $SCRIPT_DIR/package.list | tr "\n" " ") >>$OUTPUT 2>&1 $(grep -vE "^\s*#" $SCRIPT_DIR/package.list | tr "\n" " ") >>$OUTPUT 2>&1
fi fi
chown live.users /home/live chown live:live /home/live
chown -R live.users /home/live chown -R live:live /home/live

9
linux-live/modules/03-desktop/install
View File

@ -19,8 +19,7 @@ apt-get install --no-install-recommends --yes \
(cd /rootcopy && cp --parents -afr * /) (cd /rootcopy && cp --parents -afr * /)
chown live.users /home/live chown live:live /home/live
chown -R live.users /home/live/.gtkrc-2.0 #chown -R live:live /home/live/.gtkrc-2.0
chown -R live.users /home/live/.config #chown -R live:live /home/live/.config
chown -R live:live /home/live
chown -R live.users /home/live

4
linux-live/modules/04-apps/install
View File

@ -14,5 +14,5 @@ apt-get install --no-install-recommends --yes \
(cd /rootcopy && cp --parents -afr * /) (cd /rootcopy && cp --parents -afr * /)
chown live.users /home/live chown live:live /home/live
chown -R live.users /home/live chown -R live:live /home/live
Write Preview
Loading…
Cancel
Save