From 533f5cb5d0c01b46e0dcd144fbe8043f22278a1d Mon Sep 17 00:00:00 2001 From: eoli3n Date: Sun, 24 Dec 2017 21:10:42 +0100 Subject: [PATCH] addeed neofetch dir --- docker/archlinux/Dockerfile | 18 +++++++++++++----- docker/archlinux/README.md | 6 +++++- roles/neofetch/tasks/main.yml | 3 +++ roles/zsh/tasks/main.yml | 3 +-- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/docker/archlinux/Dockerfile b/docker/archlinux/Dockerfile index 9e17351..b90f7c2 100644 --- a/docker/archlinux/Dockerfile +++ b/docker/archlinux/Dockerfile @@ -1,8 +1,6 @@ FROM archlinux/base AS build -RUN pacman -Syu --noconfirm && pacman -S --noconfirm \ - ansible \ - jshon \ - git \ +# Archlinux Deps +RUN pacman -Syu --noconfirm \ sudo \ binutils \ util-linux \ @@ -17,11 +15,21 @@ RUN pacman -Syu --noconfirm && pacman -S --noconfirm \ perl \ automake \ autoconf \ - xorg-server-xephyr + gettext \ + patch \ + xorg-server-xephyr || df -h ENV PATH="${PATH}:/usr/bin/core_perl" +# Project deps +RUN pacman -S --noconfirm \ + ansible \ + jshon \ + git +# Create test user RUN useradd -m test 2> /dev/null RUN echo "test ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +# Fix tmp dir perms RUN chmod 1777 /tmp +# User run USER test WORKDIR /home/test/ RUN git clone --recursive https://github.com/eoli3n/dotfiles diff --git a/docker/archlinux/README.md b/docker/archlinux/README.md index 277b8f5..6663efc 100644 --- a/docker/archlinux/README.md +++ b/docker/archlinux/README.md @@ -5,8 +5,12 @@ sudo rm -Rf /var/lib/docker sudo ln -s /home/docker /var/lib/docker ``` -## Clean docker files +## Clean Docker files ``` sudo docker system prune ``` +## Start Docker +``` +sudo docker build -t archlinux-dotfiles . +``` diff --git a/roles/neofetch/tasks/main.yml b/roles/neofetch/tasks/main.yml index 5196d96..7db01ab 100644 --- a/roles/neofetch/tasks/main.yml +++ b/roles/neofetch/tasks/main.yml @@ -5,6 +5,9 @@ - w3m - neofetch +- name: creates neofetch conf dir + file: path=~/.config/neofetch state=directory + - name: Configure neofetch copy: src=files/config.conf dest=~/.config/neofetch/config.conf diff --git a/roles/zsh/tasks/main.yml b/roles/zsh/tasks/main.yml index 802ec2d..48d38b9 100644 --- a/roles/zsh/tasks/main.yml +++ b/roles/zsh/tasks/main.yml @@ -38,8 +38,7 @@ when: ansible_distribution != "Debian" - name: Install oh-my-zsh - shell: creates=~/.oh-my-zsh sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" - ignore_errors: True + shell: creates=~/.oh-my-zsh sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh) ||:" - name: Search for zsh-syntax-highlighting shell: find /usr -name zsh-syntax-highlighting.zsh 2>/dev/null