]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commitdiff
make.sh: Remove docker stuff
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 4 Jul 2024 19:14:19 +0000 (19:14 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Jul 2024 15:39:43 +0000 (15:39 +0000)
This is basically unused for years. I even forgot we had this.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
doc/make.sh-usage
make.sh
tools/docker/Dockerfile [deleted file]

index 9174ced6f54fff21cc321f0545a1a2fd45dc7462..e2b8b9d29eb5e9b57102fa8c479cad5858aa8a9f 100644 (file)
@@ -8,7 +8,6 @@ Standard commands:
 
 Maintainer and advanced commands:
   check-manualpages    Check the manual pages for broken links
-  docker               Build a docker image
   find-dependencies    Confirm needed libraries are included in build
   lang                 Check translations for missing or obsolete strings
   shell                        Enter a shell inside the chroot. Used to tune lfs script
diff --git a/make.sh b/make.sh
index 521adc5136057e2ae7ad438db495029aaa2fabe7..dd58e9578133295acc0de85f2a04a4630157b26a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1966,20 +1966,6 @@ clean)
        fi
        print_status DONE
        ;;
-docker)
-       # Build the docker image if it does not exist, yet
-       if ! docker images -a | grep -q ^ipfire-builder; then
-               if docker build -t ipfire-builder ${BASEDIR}/tools/docker; then
-                       print_status DONE
-               else
-                       print_status FAIL
-                       exit 1
-               fi
-       fi
-
-       # Run the container and enter a shell
-       docker run -it --privileged -v "${BASEDIR}:/build" -w "/build" ipfire-builder bash -l
-       ;;
 downloadsrc)
        if [ ! -d $BASEDIR/cache ]; then
                mkdir $BASEDIR/cache
@@ -2138,7 +2124,7 @@ check-manualpages)
        fi
        ;;
 *)
-       echo "Usage: $0 [OPTIONS] {build|check-manualpages|clean|docker|downloadsrc|find-dependencies|gettoolchain|lang|shell|toolchain|update-contributors|uploadsrc}"
+       echo "Usage: $0 [OPTIONS] {build|check-manualpages|clean|downloadsrc|find-dependencies|gettoolchain|lang|shell|toolchain|update-contributors|uploadsrc}"
        cat doc/make.sh-usage
        ;;
 esac
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
deleted file mode 100644 (file)
index 6fcd5cb..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# This image is based on the latest stable version of Debian
-FROM debian:stable
-
-# Install all updates
-RUN apt-get update && apt-get dist-upgrade -y
-
-# Install all packages needed for the build
-RUN apt-get install -y \
-       build-essential \
-       autoconf \
-       automake \
-       bison \
-       flex \
-       gawk \
-       git \
-       libz-dev \
-       wget
-
-# Enable colors in git
-RUN git config --global color.ui auto
-
-WORKDIR ~