diff options
| -rw-r--r-- | Dockerfile | 34 | ||||
| -rw-r--r-- | Dockerfile-Hyperbola-v03 | 27 | ||||
| -rw-r--r-- | Dockerfile-Hyperbola-v04 | 27 | ||||
| -rw-r--r-- | README.md | 6 |
4 files changed, 59 insertions, 35 deletions
diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 31933af..0000000 --- a/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -FROM scratch -MAINTAINER Jesus E. - -# Set the $architecture ARG on your `docker build' command line with `--build-arg architecture=x86_64' or `i686'. -ARG architecture - -ADD bootstrap.tar.gz / - -RUN if [ "$architecture" != "x86_64" -a "$architecture" != "i686" ]; then \ - printf '\nYou need to specify the architecture with "--build-arg architecture=i686" on your\n\ - \r"docker build" command line. "x86_64" and "i686" are supported. Aborting build!\n\n'; exit 1; fi - -RUN \ - # First - pacman-key --init \ - && pacman-key --populate hyperbola \ - # Another bit of a hack, until Hyperbola bootstrap tarballs start including `sed' package, which is required by - # `rankmirrors', which comes with `pacman' package, while that one doesn't depend on `sed'. (Note to self: ask the - # Hyperbola devs about this; `locale-gen' uses `sed' too). Again, lucky it has very little deps. - && sed -i "s/^Architecture = auto$/Architecture = $architecture/" /etc/pacman.conf \ - # `locale-gen' needs `gzip' (via `localedef', which works on /usr/share/i18n/charmaps/*.gz), `paccache' needs `awk'. - # Update the system BTW. - && pacman -Su --noconfirm --noprogressbar --quiet gzip awk \ - # Remove the last leftovers of the initial dirty `haveged' install. - && paccache -r -k0 \ - && echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen \ - && locale-gen \ - && echo 'LANG=en_US.UTF-8' > /etc/locale.conf \ - && pacman -Scc --noconfirm - -ENV LANG en_US.UTF-8 - -# As per https://docs.docker.com/engine/userguide/networking/default_network/configure-dns/, the /etc/hostname, -# /etc/hosts and /etc/resolv.conf should be rather left alone. diff --git a/Dockerfile-Hyperbola-v03 b/Dockerfile-Hyperbola-v03 new file mode 100644 index 0000000..b2e5d3b --- /dev/null +++ b/Dockerfile-Hyperbola-v03 @@ -0,0 +1,27 @@ +FROM scratch +MAINTAINER Jesus E. + +# Set the $architecture ARG on your `docker build' command line with `--build-arg architecture=x86_64' or `i686'. +ARG architecture + +ADD bootstrap.tar.gz / + +RUN \ +# First +pacman-key --init \ +&& pacman-key --populate archlinux hyperbola \ +# Another bit of a hack, until Hyperbola bootstrap tarballs start including `sed' package, which is required by +# `rankmirrors', which comes with `pacman' package, while that one doesn't depend on `sed'. (Note to self: ask the +# Hyperbola devs about this; `locale-gen' uses `sed' too). Again, lucky it has very little deps. +&& sed -i "s/^Architecture = auto$/Architecture = $architecture/" /etc/pacman.conf \ +# `locale-gen' needs `gzip' (via `localedef', which works on /usr/share/i18n/charmaps/*.gz), `paccache' needs `awk'. +# Update the system BTW. +&& pacman -Su --noconfirm --noprogressbar --quiet gzip awk \ +# Remove the last leftovers of the initial dirty `haveged' install. +&& paccache -r -k0 \ +&& echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen \ +&& locale-gen \ +&& echo 'LANG=en_US.UTF-8' > /etc/locale.conf \ +&& pacman -Scc --noconfirm + +ENV LANG en_US.UTF-8 diff --git a/Dockerfile-Hyperbola-v04 b/Dockerfile-Hyperbola-v04 new file mode 100644 index 0000000..f89d46a --- /dev/null +++ b/Dockerfile-Hyperbola-v04 @@ -0,0 +1,27 @@ +FROM scratch +MAINTAINER Jesus E. + +# Set the $architecture ARG on your `docker build' command line with `--build-arg architecture=x86_64' or `i686'. +ARG architecture + +ADD bootstrap.tar.gz / + +RUN \ +# First +pacman-key --init \ +&& pacman-key --populate hyperbola \ +# Another bit of a hack, until Hyperbola bootstrap tarballs start including `sed' package, which is required by +# `rankmirrors', which comes with `pacman' package, while that one doesn't depend on `sed'. (Note to self: ask the +# Hyperbola devs about this; `locale-gen' uses `sed' too). Again, lucky it has very little deps. +&& sed -i "s/^Architecture = auto$/Architecture = $architecture/" /etc/pacman.conf \ +# `locale-gen' needs `gzip' (via `localedef', which works on /usr/share/i18n/charmaps/*.gz), `paccache' needs `awk'. +# Update the system BTW. +&& pacman -Su --noconfirm --noprogressbar --quiet gzip awk \ +# Remove the last leftovers of the initial dirty `haveged' install. +&& paccache -r -k0 \ +&& echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen \ +&& locale-gen \ +&& echo 'LANG=en_US.UTF-8' > /etc/locale.conf \ +&& pacman -Scc --noconfirm + +ENV LANG en_US.UTF-8 @@ -28,7 +28,11 @@ Usage - Build the image with a command like: - docker build --build-arg architecture=x86_64 --tag hyperbola-x86_64-base . + docker build --build-arg architecture=x86_64 --tag hyperbola:0.4 -f Dockerfile-Hyperbola-v04 . + + or for Hyperbola Milky Way v0.3 + + docker build --build-arg architecture=x86_64 --tag hyperbola:0.3 -f Dockerfile-Hyperbola-v03 . > **Mind the dot!** Use `--build-arg architecture=i686` if you are building from an i686 `bootstrap.tar.gz`. |