From 1688b61b3046b9aae1576ce52c50e8fc7e2eb36d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 29 Dec 2016 18:33:54 +0000 Subject: [PATCH 1/2] Add docker to the default Fedora installation --- fedora/configure_fresh_system | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 55a2b6ed..138939ef 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -6,7 +6,7 @@ if [[ -z $NOUPGRADE ]]; then sudo dnf -y upgrade --best --allowerasing fi -sudo dnf -y --best --allowerasing install tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv nodejs npm terminator gsmartcontrol python-pip mercurial python3-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop dnf-automatic kdiff3 yum-utils util-linux-user ncurses-devel zeal qt5-linguist qtkeychain-qt5-devel archivemount keepass splix gutenprint-cups cups-bjnp golang redhat-rpm-config +sudo dnf -y --best --allowerasing install tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv nodejs npm terminator gsmartcontrol python-pip mercurial python3-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop dnf-automatic kdiff3 yum-utils util-linux-user ncurses-devel zeal qt5-linguist qtkeychain-qt5-devel archivemount keepass splix gutenprint-cups cups-bjnp golang redhat-rpm-config docker sudo dnf -y groupinstall "C Development Tools and Libraries" sudo dnf -y groupinstall "Development Tools" @@ -27,8 +27,14 @@ if [[ -z $NO_SYSTEMCTL ]]; then sudo systemctl enable dnf-automatic.timer sudo systemctl start dnf-automatic.timer sudo systemctl list-timers "*dnf-*" + sudo systemctl enable docker + sudo systemctl restart docker fi +# docker +sudo groupadd docker +sudo usermod -aG docker $USER + if [[ -z $NO_COMPILE_VIM ]]; then VIM_BUILD_DIR=/tmp cd "$VIM_BUILD_DIR" From c5fa70cf1719e9992002fe92fa9487c8faec3fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 29 Dec 2016 19:08:49 +0000 Subject: [PATCH 2/2] Set USER to whoami if needed --- fedora/configure_fresh_system | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 138939ef..bf58d2ba 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -32,6 +32,9 @@ if [[ -z $NO_SYSTEMCTL ]]; then fi # docker +if [[ -z $USER ]]; then + USER=`whoami` +fi sudo groupadd docker sudo usermod -aG docker $USER