Fix Image tag and clean up ansible

Author: Michael Bushey

Dockerfile

@@ -1,5 +1,5 @@
 # Re-use the phusion baseimage which runs an SSH server etc
-FROM phusion/baseimage
+FROM phusion/baseimage:master-amd64
 
 # Some definitions
 ENV SUDOFILE /etc/sudoers
@@ -29,16 +29,15 @@ RUN \
     chown -R vagrant:vagrant /home/vagrant/.ssh && \
     # Update apt-cache, so that stuff can be installed \
     # Install python (otherwise ansible will not work) \
-    # Install aptitude, since ansible needs it (only apt-get is installed) \
     apt-get -y update && \
-    apt-get -y install sudo python python-dev python-pip aptitude && \
+    apt-get -y install sudo python3 python3-dev python3-pip && \
     # Enable password-less sudo for all user (including the 'vagrant' user) \
     chmod u+w ${SUDOFILE} && \
     echo '%sudo   ALL=(ALL:ALL) NOPASSWD: ALL' >> ${SUDOFILE} && \
     chmod u-w ${SUDOFILE} && \
     apt-get clean && \
     # install ansible
-    pip install ansible && \
+    pip3 install ansible && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
     # we put the 'last time apt-get update was run' file far in the past \
     # so that ansible can then re-run apt-get update \

provisioning/roles/neovim/tasks/main.yml

@@ -1,45 +1,41 @@
 ---
-  - name: Add neovim ppa 
-    apt_repository: repo="ppa:neovim-ppa/stable" state=present
+- name: Add neovim ppa
+  apt_repository: repo="ppa:neovim-ppa/stable" state=present
 
-  - name: Install neovim from ppa
-    apt: name="neovim" state="present"
+- name: Install neovim from ppa
+  apt: name="neovim" state="present"
 
-# install vim-plug
+- name: Install vim-plug
+  block:
+    - name: Make "{{ neovim_config_dir }}/autoload" directory
+      file: path="{{ neovim_config_dir }}/autoload" state=directory
 
-  - name: Make "{{ neovim_config_dir }}/autoload" directory
-    file: path="{{ neovim_config_dir }}/autoload" state=directory
-    become: yes
-    become_user: vagrant
+    - name: Make "{{ neovim_data_dir }}/plugged" directory
+      file: path="{{ neovim_data_dir }}/plugged" state=directory
 
-  - name: Make "{{ neovim_data_dir }}/plugged" directory
-    file: path="{{ neovim_data_dir }}/plugged" state=directory
-    become: yes
-    become_user: vagrant
+    - name: Install vim-plug
+      get_url:
+        url: " https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim"
+        dest: "{{ neovim_config_dir }}/autoload/plug.vim"
+        mode: 0700
 
-  - name: Install vim-plug
-    get_url:
-      url: " https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim"
-      dest: "{{ neovim_config_dir }}/autoload/plug.vim"
-    become: yes
-    become_user: vagrant
+  become: yes
+  become_user: vagrant
 
 # install deoplete
-
-  - name: Installing neovim pip3 package
-    command: pip3 install neovim
+- name: Installing neovim pip3 package
+  command: pip3 install neovim
 
 # Copy the init file
-  - name: copy init files in rc folder
-    copy:
-      src="init.vim"
-      dest="{{ neovim_config_dir }}/init.vim"
-      owner="{{ username }}"
-      group="{{ username }}"
-      mode=0640
-
-# install vim plugins
-  - name: Install vim plugins 
-    command: nvim '+silent!' '+PlugInstall!' '+qall!'
-    become: yes
-    become_user: vagrant
+- name: copy init files in rc folder
+  copy:
+    src="init.vim"
+    dest="{{ neovim_config_dir }}/init.vim"
+    owner="{{ username }}"
+    group="{{ username }}"
+    mode=0640
+
+- name: Install vim plugins
+  command: nvim '+silent!' '+PlugInstall!' '+qall!'
+  become: yes
+  become_user: vagrant

provisioning/roles/rust/tasks/main.yml

@@ -1,34 +1,26 @@
 ---
-
+- block:
   - name: download rustup
     get_url:
       url: "https://sh.rustup.rs"
       dest: "/tmp/rustup.sh"
       validate_certs: False
-    become: yes
-    become_user: vagrant
+      mode: 0700
 
   - name: install rustup and rust nightly
     command: "sh /tmp/rustup.sh --default-toolchain nightly -y"
-    become: yes
-    become_user: vagrant
 
   - name: install rust language server (rls)
     command: /home/vagrant/.cargo/bin/rustup component add rls-preview
-    become: yes
-    become_user: vagrant
 
   - name: install rust sources for racer
     command: /home/vagrant/.cargo/bin/rustup component add rust-src
-    become: yes
-    become_user: vagrant
 
   - name: install rust analysis
     command: /home/vagrant/.cargo/bin/rustup component add rust-analysis
-    become: yes
-    become_user: vagrant
 
   - name: install racer (take ~20 minutes)
     command: /home/vagrant/.cargo/bin/cargo install racer
-    become: yes
-    become_user: vagrant
+
+  become: yes
+  become_user: vagrant

provisioning/site.yml

@@ -8,29 +8,13 @@
     document_root: "/{{ username }}"
 
   pre_tasks:
-    - name: Install stuff from Aptitude
-      apt: 
-        name="{{ item }}"
-        state=present
-        update_cache=yes 
-        cache_valid_time=86400
-      with_items:
-       - sudo
-       - git
-       - tig
-       - vim
-       - gcc
-       - gdb
-       - bash-completion # Not included in the docker image
-       - make
-       - tree
-       - htop
-       - man-db
-       - software-properties-common
-       - python-dev
-       - python-pip
-       - python3-dev
-       - python3-pip
+    - name: Install from Apt
+      apt:
+        # bash-completion is not in phusion
+        name: ['sudo', 'git', 'tig', 'vim', 'gcc', 'gdb', 'bash-completion', 'make', 'tree', 'htop', 'man-db', 'software-properties-common', 'python3-dev', 'python3-pip']
+        state: present
+        update_cache: yes
+        cache_valid_time: 14400 # 4 hours
 
   roles:
     - rust