more dockerfile tweaks

etc/docker/ubuntu-with-gnupg/Dockerfile

@@ -1,24 +1,26 @@
 FROM fpco/ubuntu-with-libgmp:14.04
 
-# SETUP GROUP/USERS
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update
+RUN apt-get -y install curl expect
+
+# SETUP A NIX BUILD GROUP & USER
 RUN groupadd -r nixbld
-RUN useradd -c "Nix Build User" -d /var/empty -g nixbld -G nixbld \
+RUN useradd -c "Nix Build" -d /var/empty -g nixbld -G nixbld \
     -M -N -r -s "$(which nologin)" nixbld
 
 # INSTALL NIX
-RUN apt-get update
-RUN apt-get -y install curl
 RUN curl -s https://nixos.org/nix/install | USER=root sh
-RUN cp /nix/var/nix/profiles/default/etc/profile.d/nix.sh /etc/profile.d/
+RUN ln -s /nix/var/nix/profiles/default/etc/profile.d/nix.sh /etc/profile.d/
 RUN bash -lc "nix-channel --update"
 
-# INSTALL ALL 3 VERSIONS OF GNUPG INTO SEPARATE PROFILES
-RUN bash -lc "nix-env -p /nix/var/nix/profiles/gnupg14 -iA nixpkgs.nix nixpkgs.gnupg1orig"
-RUN bash -lc "nix-env -p /nix/var/nix/profiles/gnupg20 -iA nixpkgs.nix nixpkgs.gnupg20"
-RUN bash -lc "nix-env -p /nix/var/nix/profiles/gnupg21 -iA nixpkgs.nix nixpkgs.gnupg"
+# INSTALL ALL 3 VERSIONS OF GNUPG
+RUN bash -lc "nix-env -p /nix/var/nix/profiles/gpg14 -iA nixpkgs.nix nixpkgs.gnupg1orig"
+RUN bash -lc "nix-env -p /nix/var/nix/profiles/gpg20 -iA nixpkgs.nix nixpkgs.gnupg20"
+RUN bash -lc "nix-env -p /nix/var/nix/profiles/gpg21 -iA nixpkgs.nix nixpkgs.gnupg"
 
-# MAKE GNUPG 1 THE DEFAULT PROFILE
-RUN bash -lc "nix-env -S /nix/var/nix/profiles/gnupg14"
+# MAKE GNUPG 1 THE DEFAULT
+RUN bash -lc "nix-env -S /nix/var/nix/profiles/gpg14"
 
 # CREATE USER w/ HOME DIR
 RUN useradd -m user
@@ -29,8 +31,12 @@ RUN chmod -R go-rwsx $HOME
 WORKDIR $HOME
 
 # SETUP GPG
-RUN apt-get -y install expect
 USER user
 RUN bash -lc "gpg --import $HOME/.gnupg/public.asc $HOME/.gnupg/subkey.asc"
 RUN bash -lc "expect $HOME/.gnupg/trust"
 RUN rm $HOME/.gnupg/*.asc $HOME/.gnupg/trust
+
+# CLEANUP
+RUN apt-mark auto curl expect
+RUN apt-get -y autoremove
+RUN apt-get -y clean