rename ubuntu-with-gnupg to stack-base

ljli · Mar 31, 2016 · c83139e · c83139e
1 parent 85414a2
commit c83139e
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 4 deletions.
diff --git a/etc/docker/ubuntu-with-gnupg/.gnupg/gpg.conf → etc/docker/stack-base/.gnupg/gpg.conf b/etc/docker/ubuntu-with-gnupg/.gnupg/gpg.conf → etc/docker/stack-base/.gnupg/gpg.conf
diff --git a/...ocker/ubuntu-with-gnupg/.gnupg/public.asc → etc/docker/stack-base/.gnupg/public.asc b/...ocker/ubuntu-with-gnupg/.gnupg/public.asc → etc/docker/stack-base/.gnupg/public.asc
diff --git a/...ocker/ubuntu-with-gnupg/.gnupg/secret.asc → etc/docker/stack-base/.gnupg/secret.asc b/...ocker/ubuntu-with-gnupg/.gnupg/secret.asc → etc/docker/stack-base/.gnupg/secret.asc
diff --git a/...ocker/ubuntu-with-gnupg/.gnupg/subkey.asc → etc/docker/stack-base/.gnupg/subkey.asc b/...ocker/ubuntu-with-gnupg/.gnupg/subkey.asc → etc/docker/stack-base/.gnupg/subkey.asc
diff --git a/etc/docker/ubuntu-with-gnupg/.gnupg/trust → etc/docker/stack-base/.gnupg/trust b/etc/docker/ubuntu-with-gnupg/.gnupg/trust → etc/docker/stack-base/.gnupg/trust
diff --git a/etc/docker/ubuntu-with-gnupg/Dockerfile → etc/docker/stack-base/Dockerfile b/etc/docker/ubuntu-with-gnupg/Dockerfile → etc/docker/stack-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM fpco/ubuntu-with-libgmp:14.04
+FROM ubuntu:14.04
 
 # PACKAGES
 ENV DEBIAN_FRONTEND noninteractive
@@ -30,7 +30,7 @@ RUN curl -s https://nixos.org/nix/install | sh
 RUN echo "\nsource /nix/var/nix/profiles/default/etc/profile.d/nix.sh" \
   | tee -a $HOME/.bash_profile
 
-# GNUPGs IN PROFILES
+# INSTALL GNUPGs
 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"

diff --git a/stack.yaml b/stack.yaml
@@ -1,8 +1,8 @@
 resolver: lts-5.3
 image:
   containers:
-    - base: "fpco/ubuntu-with-gnupg:14.04"
-      name: "fpco/stack:test"
+    - base: "fpco/stack-base" # see ./etc/docker/stack-base/Dockerfile
+      name: "fpco/stack-test"
 nix:
   # --nix on the command-line to enable.
   enable: false