Skip to content

Commit

Permalink
Merge pull request #9 from unifio/v072
Browse files Browse the repository at this point in the history
V072
  • Loading branch information
blakeneyops authored Jun 17, 2017
2 parents 2ace2ad + 27c8336 commit 3029a7a
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 18 deletions.
15 changes: 0 additions & 15 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,6 @@ RUN mkdir -p /usr/local/external_bins && \
rm -rf /tmp/build && \
rm -rf /root/.gnupg

ENV DOCKER_VERSION 1.9.1
ENV DOCKER_SHA256 6a095ccfd095b1283420563bd315263fa40015f1cee265de023efef144c7e52d

RUN mkdir -p /tmp/build && \
cd /tmp/build && \
wget -q -O docker.tgz "https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz" && \
echo "${DOCKER_SHA256} *docker.tgz" | sha256sum -c - && \
tar -C / -xzvf docker.tgz && \
docker -v && \

# Cleanup
cd /tmp && \
rm -rf /tmp/build && \
rm -rf /root/.gnupg

COPY entrypoint.sh /usr/local/bin/entrypoint.sh

ENTRYPOINT ["/usr/local/bin/entrypoint.sh", "--"]
Expand Down
4 changes: 2 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ machine:
service:
- docker
environment:
COVALENCE_VERSION: 0.7.1
COVALENCE_VERSION: 0.7.2
DOCKER_IMAGE: 'unifio/covalence'
TERRAFORM_VERSION: 0.9.5
TERRAFORM_VERSION: 0.9.8
services:
- docker

Expand Down
1 change: 0 additions & 1 deletion uat/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ require 'dotenv'
Dotenv.load

require 'covalence/environment_tasks'
require 'covalence/packer_tasks'
require 'covalence/spec_tasks'

task :serverspec => 'serverspec:all'
Expand Down

0 comments on commit 3029a7a

Please sign in to comment.