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

bugfixes

master
crims0n 5 years ago
parent
b41c22cefc
commit
bbd6578f57
6 changed files with 26 additions and 38 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. 16
      docker/Dockerfile.minios-live
  2. 7
      docker/Dockerfile.minios-live-container
  3. 7
      docker/Dockerfile.minios-live-container.0@install.sh
  4. 4
      docker/Dockerfile.py
  5. 19
      docker/Dockerfile2.py
  6. 11
      linux-live/minioslib

16
docker/Dockerfile.minios-live
View File

@ -1,16 +0,0 @@
FROM ubuntu:focal
COPY Dockerfile.minios-live.0@install.sh /opt/install.sh
RUN chmod +x /opt/install.sh
RUN /opt/install.sh
RUN rm /opt/install.sh
ENV LOGPATH="/var/log"
ENV BUILD_TEST_ISO="0"
ENV DEV_SYSTEM="0"
ENV CREATE_BACKUP="0"
ENV DEBIAN_FRONTEND_TYPE="noninteractive"
ENV APT_CMD="apt-get"
ENV APT_OPTIONS="-y"
VOLUME /build
WORKDIR /build
CMD ["/build/minios-live/autoinstall", "-"]

7
docker/Dockerfile.minios-live-container
View File

@ -0,0 +1,7 @@
FROM ubuntu:focal
COPY Dockerfile.minios-live-container.0@install.sh /opt/install.sh
RUN chmod +x /opt/install.sh && /opt/install.sh && rm /opt/install.sh
VOLUME /build
WORKDIR /build/minios-live
CMD ["/build/minios-live/autoinstall", "-"]

7
docker/Dockerfile.minios-live.0@install.sh → docker/Dockerfile.minios-live-container.0@install.sh
View File

@ -9,9 +9,10 @@ trap '_failure ${LINENO} "$BASH_COMMAND"' ERR
# ############################################################################ # # ############################################################################ #
touch /.minios-live-container
apt-get update -y apt-get update -y
apt-get install -y wget patch sudo debootstrap xorriso apt-get install -y sudo debootstrap xorriso
touch /minios-live-container : 'apt-get install -y wget patch sudo debootstrap xorriso
cd /opt/ cd /opt/
wget -c http://ru.archive.ubuntu.com/ubuntu/pool/main/d/debootstrap/debootstrap_1.0.123ubuntu2_all.deb wget -c http://ru.archive.ubuntu.com/ubuntu/pool/main/d/debootstrap/debootstrap_1.0.123ubuntu2_all.deb
dpkg -i /opt/debootstrap_1.0.123ubuntu2_all.deb dpkg -i /opt/debootstrap_1.0.123ubuntu2_all.deb
@ -33,7 +34,7 @@ cat <<'EOF' >/usr/share/debootstrap/functions.diff
EOF EOF
cd /usr/share/debootstrap/ cd /usr/share/debootstrap/
patch </usr/share/debootstrap/functions.diff patch </usr/share/debootstrap/functions.diff '
apt-get clean apt-get clean
find /var/log/ -type f | xargs rm -f find /var/log/ -type f | xargs rm -f
rm -f /var/backups/* rm -f /var/backups/*

4
docker/Dockerfile.py
View File

@ -13,7 +13,7 @@ class DockerFile(pydocker.DockerFile):
""" add here your custom features """ """ add here your custom features """
d = DockerFile(base_img='ubuntu:focal', name='crims0n/minios-live:latest') d = DockerFile(base_img='ubuntu:focal', name='crims0n/minios-live-container:latest')
d.RUN_bash_script('/opt/install.sh', r''' d.RUN_bash_script('/opt/install.sh', r'''
apt-get update -y apt-get update -y
@ -68,7 +68,7 @@ d.ENV = 'APT_CMD="apt-get"'
d.ENV = 'APT_OPTIONS="-y"' d.ENV = 'APT_OPTIONS="-y"'
d.VOLUME = '/build' d.VOLUME = '/build'
d.WORKDIR = '/build' d.WORKDIR = '/build/minios-live'
# d.ENTRYPOINT = ["/opt/www-data/entrypoint.sh"] # d.ENTRYPOINT = ["/opt/www-data/entrypoint.sh"]
d.CMD = ["/opt/minios-live/autoinstall", "-"] d.CMD = ["/opt/minios-live/autoinstall", "-"]

19
docker/Dockerfile2.py
View File

@ -13,12 +13,13 @@ class DockerFile(pydocker.DockerFile):
""" add here your custom features """ """ add here your custom features """
d = DockerFile(base_img='ubuntu:focal', name='crims0n/minios-live:latest') d = DockerFile(base_img='ubuntu:focal', name='crims0n/minios-live-container:latest')
d.RUN_bash_script('/opt/install.sh', r''' d.RUN_bash_script('/opt/install.sh', r'''
touch /.minios-live-container
apt-get update -y apt-get update -y
apt-get install -y wget patch sudo debootstrap xorriso apt-get install -y sudo debootstrap xorriso
touch /minios-live-container : 'apt-get install -y wget patch sudo debootstrap xorriso
cd /opt/ cd /opt/
wget -c http://ru.archive.ubuntu.com/ubuntu/pool/main/d/debootstrap/debootstrap_1.0.123ubuntu2_all.deb wget -c http://ru.archive.ubuntu.com/ubuntu/pool/main/d/debootstrap/debootstrap_1.0.123ubuntu2_all.deb
dpkg -i /opt/debootstrap_1.0.123ubuntu2_all.deb dpkg -i /opt/debootstrap_1.0.123ubuntu2_all.deb
@ -40,7 +41,7 @@ cat <<'EOF' >/usr/share/debootstrap/functions.diff
EOF EOF
cd /usr/share/debootstrap/ cd /usr/share/debootstrap/
patch </usr/share/debootstrap/functions.diff patch </usr/share/debootstrap/functions.diff '
apt-get clean apt-get clean
find /var/log/ -type f | xargs rm -f find /var/log/ -type f | xargs rm -f
rm -f /var/backups/* rm -f /var/backups/*
@ -58,16 +59,8 @@ rm -f /var/lib/apt/lists/deb.*
rm -f /var/lib/dpkg/*-old rm -f /var/lib/dpkg/*-old
''') ''')
d.ENV = 'LOGPATH="/var/log"'
d.ENV = 'BUILD_TEST_ISO="0"'
d.ENV = 'DEV_SYSTEM="0"'
d.ENV = 'CREATE_BACKUP="0"'
d.ENV = 'DEBIAN_FRONTEND_TYPE="noninteractive"'
d.ENV = 'APT_CMD="apt-get"'
d.ENV = 'APT_OPTIONS="-y"'
d.VOLUME = '/build' d.VOLUME = '/build'
d.WORKDIR = '/build' d.WORKDIR = '/build/minios-live'
# d.ENTRYPOINT = ["/opt/www-data/entrypoint.sh"] # d.ENTRYPOINT = ["/opt/www-data/entrypoint.sh"]
d.CMD = ["/build/minios-live/autoinstall", "-"] d.CMD = ["/build/minios-live/autoinstall", "-"]

11
linux-live/minioslib
View File

@ -18,10 +18,10 @@ function common_variables() {
container="" container=""
fi fi
set -u set -u
if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then : 'if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then
OUTPUT="/dev/stdout" OUTPUT="/dev/stdout"
#CONTAINER="docker" #CONTAINER="docker"
fi fi'
if [ -f /.dockerenv ] || [ "$container" = "podman" ] && [ ! -d /opt/minios-live ] && [ ! -f /.minios-live-container ]; then if [ -f /.dockerenv ] || [ "$container" = "podman" ] && [ ! -d /opt/minios-live ] && [ ! -f /.minios-live-container ]; then
CONTAINER_TYPE="1" CONTAINER_TYPE="1"
fi fi
@ -738,7 +738,9 @@ function chroot_setup_host() {
function hostreq_pkg_list() { function hostreq_pkg_list() {
echo -e "${YELLOW}=====> installing required software for host system ...${ENDCOLOUR}" echo -e "${YELLOW}=====> installing required software for host system ...${ENDCOLOUR}"
$APT_CMD update >>$OUTPUT 2>&1 $APT_CMD update >>$OUTPUT 2>&1
if [ $CONTAINER_TYPE = "1" ]; then
# we need this only for trusty container
: 'if [ $CONTAINER_TYPE = "1" ]; then
touch /.minios-live touch /.minios-live
$APT_CMD install -y wget patch >>$OUTPUT 2>&1 $APT_CMD install -y wget patch >>$OUTPUT 2>&1
cd ~ cd ~
@ -762,7 +764,8 @@ function hostreq_pkg_list() {
EOF EOF
cd /usr/share/debootstrap/ cd /usr/share/debootstrap/
patch </usr/share/debootstrap/functions.diff patch </usr/share/debootstrap/functions.diff
fi fi'
if [ -f $SCRIPT_DIR/linux-live/pkglists/hostreq.list ]; then if [ -f $SCRIPT_DIR/linux-live/pkglists/hostreq.list ]; then
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install -y \ $APT_CMD install -y \

Write Preview
Loading…
Cancel
Save