Tagged major and minor versions of Docker images instead of "latest"

Author: migurski

Dockerfile-machine

@@ -1,4 +1,4 @@
-FROM openaddr/prereqs:latest
+FROM openaddr/prereqs:4.x
 
 # From chef/openaddr/recipes/default.rb
 COPY . /usr/local/src/openaddr

circle.yml

@@ -4,10 +4,10 @@ machine:
 
 dependencies:
   pre:
-    - docker pull openaddr/prereqs || true
+    - docker pull openaddr/prereqs:`cut -f1 -d. openaddr/VERSION`.x || true
   override:
-    - docker build -f Dockerfile-prereqs -t openaddr/prereqs:latest .
-    - docker build -f Dockerfile-machine -t openaddr/machine:latest .
+    - docker build -f Dockerfile-prereqs -t openaddr/prereqs:`cut -f1 -d. openaddr/VERSION`.x .
+    - docker build -f Dockerfile-machine -t openaddr/machine:`cut -f1 -d. openaddr/VERSION`.x .
 
 test:
   override:
@@ -20,9 +20,9 @@ deployment:
     branch: [migurski/docker-docker-docker]
     commands:
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
-      - docker tag openaddr/prereqs:latest openaddr/prereqs:`cat openaddr/VERSION`
+      - docker tag openaddr/prereqs:`cut -f1 -d. openaddr/VERSION`.x openaddr/prereqs:`cat openaddr/VERSION`
+      - docker tag openaddr/machine:`cut -f1 -d. openaddr/VERSION`.x openaddr/machine:`cat openaddr/VERSION`
+      - docker push openaddr/prereqs:`cut -f1 -d. openaddr/VERSION`.x
+      - docker push openaddr/machine:`cut -f1 -d. openaddr/VERSION`.x
       - docker push openaddr/prereqs:`cat openaddr/VERSION`
-      - docker push openaddr/prereqs:latest
-      - docker tag openaddr/machine:latest openaddr/machine:`cat openaddr/VERSION`
       - docker push openaddr/machine:`cat openaddr/VERSION`
-      - docker push openaddr/machine:latest

docker-compose.yml

@@ -1,5 +1,5 @@
 machine:
-  image: openaddr/machine:latest
+  image: openaddr/machine:`cut -f1 -d. openaddr/VERSION`.x
   environment:
     - DATABASE_URL=postgresql://openaddr:openaddr@postgres/openaddr
   links: