From e403df009493a52539c6771b766534027bbf677a Mon Sep 17 00:00:00 2001 From: Disassembler Date: Mon, 9 Jul 2018 15:14:44 +0200 Subject: [PATCH] Bump Alpine version to 3.8 --- README.md | 4 +++- alpine.sh | 13 ++++++++----- basic/Dockerfile | 2 +- postgres/Dockerfile | 2 +- rabbitmq/Dockerfile | 2 +- redis/Dockerfile | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index eb66c67..e5e2cda 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,11 @@ This is the main repository containing all installation scripts, configuration a - **CPU:** 1 processor, 2 cores - **Hard Disk:** SCSI, 60 GB +In case you're setting up a VMWare virtual machine, select OS type *Other Linux 3.x kernel 64-bit* and after you create the VM, manually edit the `*.vmx` file using a text editor and set there `mem.hotadd = "FALSE"`. Failing to do so will result in system unable to boot. Other hypervizors don't need this adjustment. + ## Operating system installation -Download **Alpine Virtual 3.7.0 x86_64** from and boot from it. At the login prompt, use the root user without password to log in. +Download **Alpine Virtual 3.8.0 x86_64** from and boot from it. At the login prompt, use the root user without password to log in. ``` # Set up interfaces (leave the default choices) diff --git a/alpine.sh b/alpine.sh index 2876397..a19ec3b 100755 --- a/alpine.sh +++ b/alpine.sh @@ -1,13 +1,16 @@ #!/bin/sh -# Prerequisites +# Based on +# https://wiki.alpinelinux.org/wiki/LVM_on_LUKS + +# Prerequisites for this script # setup-interfaces # ifup eth0 # Set up repositories cat </etc/apk/repositories -http://dl-cdn.alpinelinux.org/alpine/v3.7/main -http://dl-cdn.alpinelinux.org/alpine/v3.7/community +http://dl-cdn.alpinelinux.org/alpine/v3.8/main +http://dl-cdn.alpinelinux.org/alpine/v3.8/community #http://dl-cdn.alpinelinux.org/alpine/edge/main #http://dl-cdn.alpinelinux.org/alpine/edge/community #http://dl-cdn.alpinelinux.org/alpine/edge/testing @@ -60,7 +63,7 @@ mount -t ext4 /dev/sda1 /mnt/boot setup-disk -m sys /mnt # Update boot-time volume information -BOOT_UUID=$(blkid /dev/sda1 | awk '{print $2}' | tr -d '"') +BOOT_UUID=$(blkid /dev/sda1 | cut -d' ' -f2 | tr -d '"') cat </mnt/etc/fstab /dev/vg0/root / ext4 rw,noatime,data=ordered 0 1 ${BOOT_UUID} /boot ext4 rw,noatime,data=ordered 0 2 @@ -72,7 +75,7 @@ echo "system /dev/sda2 none luks" >/mnt/etc/crypttab sed -i 's/lvm/lvm cryptsetup/' /mnt/etc/mkinitfs/mkinitfs.conf mkinitfs -c /mnt/etc/mkinitfs/mkinitfs.conf -b /mnt $(ls /mnt/lib/modules) -# Update extlinux +# Update extlinux (ignore the errors) sed -i 's/rootfstype=ext4/rootfstype=ext4 cryptroot=\/dev\/sda2 cryptdm=system/' /mnt/etc/update-extlinux.conf chroot /mnt update-extlinux diff --git a/basic/Dockerfile b/basic/Dockerfile index 1019df7..31326e7 100644 --- a/basic/Dockerfile +++ b/basic/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.8 MAINTAINER Disassembler RUN \ diff --git a/postgres/Dockerfile b/postgres/Dockerfile index ee8d583..c58c97e 100644 --- a/postgres/Dockerfile +++ b/postgres/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.8 MAINTAINER Disassembler RUN \ diff --git a/rabbitmq/Dockerfile b/rabbitmq/Dockerfile index 2522079..a364cbf 100644 --- a/rabbitmq/Dockerfile +++ b/rabbitmq/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.8 MAINTAINER Disassembler RUN \ diff --git a/redis/Dockerfile b/redis/Dockerfile index 25b2206..0d6a3d9 100644 --- a/redis/Dockerfile +++ b/redis/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.8 MAINTAINER Disassembler RUN \