First commit

codeship · Apr 14, 2016 · ece5554 · ece5554
1 parent c24939c
commit ece5554
Show file tree

Hide file tree

Showing 64 changed files with 15 additions and 401 deletions.
diff --git a/01.dockerfile/Dockerfile b/01.dockerfile/Dockerfile
diff --git a/01.dockerfile/codeship-services.yml b/01.dockerfile/codeship-services.yml
diff --git a/01.dockerfile/codeship-steps.yml b/01.dockerfile/codeship-steps.yml
diff --git a/02.redis/.ruby-version b/02.redis/.ruby-version
diff --git a/02.redis/Dockerfile b/02.redis/Dockerfile
diff --git a/02.redis/Gemfile b/02.redis/Gemfile
diff --git a/02.redis/Gemfile.lock b/02.redis/Gemfile.lock
diff --git a/02.redis/check.rb b/02.redis/check.rb
diff --git a/02.redis/codeship-services.yml b/02.redis/codeship-services.yml
diff --git a/02.redis/codeship-steps.yml b/02.redis/codeship-steps.yml
diff --git a/03.redis-postgres/check.rb b/03.redis-postgres/check.rb
@@ -11,7 +11,7 @@ def exit_if_not expected, current
 redis = Redis.new(host: "redis")
 puts "REDIS VERSION: #{redis.info["redis_version"]}"
 
-sleep 2
+sleep 4
 postgres_username = "postgres"
 postgres_password = ""
 test = PG.connect("postgres", 5432, "", "", "postgres", postgres_username, postgres_password)

diff --git a/03.redis-postgres/codeship-services.yml b/03.redis-postgres/codeship-services.yml
@@ -6,6 +6,6 @@ demo:
     - redis
     - postgres
 redis:
-  image: redis:2.6.17
+  image: redis:3.0.5
 postgres:
    image: postgres:9.3.6
diff --git a/04.parallelised/codeship-services.yml b/04.parallelised/codeship-services.yml
diff --git a/04.parallelised/codeship-steps.yml b/04.parallelised/codeship-steps.yml
diff --git a/09.branch-only/codeship-services.yml b/09.branch-only/codeship-services.yml
diff --git a/09.branch-only/codeship-steps.yml b/09.branch-only/codeship-steps.yml
diff --git a/10.lots-of-parallel/codeship-services.yml b/10.lots-of-parallel/codeship-services.yml
diff --git a/10.lots-of-parallel/codeship-steps.yml b/10.lots-of-parallel/codeship-steps.yml
diff --git a/14.add_docker/codeship-services.yml b/14.add_docker/codeship-services.yml
diff --git a/14.add_docker/codeship-steps.yml b/14.add_docker/codeship-steps.yml
diff --git a/15.parallel-output-to-volume/Dockerfile b/15.parallel-output-to-volume/Dockerfile
diff --git a/15.parallel-output-to-volume/codeship-services.yml b/15.parallel-output-to-volume/codeship-services.yml
diff --git a/15.parallel-output-to-volume/codeship-steps.yml b/15.parallel-output-to-volume/codeship-steps.yml
diff --git a/15.parallel-output-to-volume/compute.sh b/15.parallel-output-to-volume/compute.sh
diff --git a/15.parallel-output-to-volume/files/1 b/15.parallel-output-to-volume/files/1
diff --git a/15.parallel-output-to-volume/files/10 b/15.parallel-output-to-volume/files/10
diff --git a/15.parallel-output-to-volume/files/11 b/15.parallel-output-to-volume/files/11
diff --git a/15.parallel-output-to-volume/files/12 b/15.parallel-output-to-volume/files/12
diff --git a/15.parallel-output-to-volume/files/13 b/15.parallel-output-to-volume/files/13
diff --git a/15.parallel-output-to-volume/files/14 b/15.parallel-output-to-volume/files/14
diff --git a/15.parallel-output-to-volume/files/15 b/15.parallel-output-to-volume/files/15
diff --git a/15.parallel-output-to-volume/files/16 b/15.parallel-output-to-volume/files/16
diff --git a/15.parallel-output-to-volume/files/17 b/15.parallel-output-to-volume/files/17
diff --git a/15.parallel-output-to-volume/files/18 b/15.parallel-output-to-volume/files/18
diff --git a/15.parallel-output-to-volume/files/19 b/15.parallel-output-to-volume/files/19
diff --git a/15.parallel-output-to-volume/files/2 b/15.parallel-output-to-volume/files/2
diff --git a/15.parallel-output-to-volume/files/20 b/15.parallel-output-to-volume/files/20
diff --git a/15.parallel-output-to-volume/files/3 b/15.parallel-output-to-volume/files/3
diff --git a/15.parallel-output-to-volume/files/4 b/15.parallel-output-to-volume/files/4
diff --git a/15.parallel-output-to-volume/files/5 b/15.parallel-output-to-volume/files/5
diff --git a/15.parallel-output-to-volume/files/6 b/15.parallel-output-to-volume/files/6
diff --git a/15.parallel-output-to-volume/files/7 b/15.parallel-output-to-volume/files/7
diff --git a/15.parallel-output-to-volume/files/8 b/15.parallel-output-to-volume/files/8
diff --git a/15.parallel-output-to-volume/files/9 b/15.parallel-output-to-volume/files/9
diff --git a/15.parallel-output-to-volume/print.sh b/15.parallel-output-to-volume/print.sh
diff --git a/16.docker_push/codeship-steps.yml b/16.docker_push/codeship-steps.yml
@@ -4,5 +4,6 @@
   type: push
   name: docker_push
   image_name: localhost:5000/myapp
+  image_tag: {{ .CommitID }}
   registry: localhost:5000
-  #encrypted_dockercfg_path: ./.dockercfg.encrypted
+  encrypted_dockercfg_path: ./.dockercfg.encrypted
diff --git a/17.caching/Dockerfile b/17.caching/Dockerfile
diff --git a/17.caching/README.md b/17.caching/README.md
diff --git a/17.caching/after.sh b/17.caching/after.sh
diff --git a/17.caching/before.sh b/17.caching/before.sh
diff --git a/17.caching/codeship-services.yml b/17.caching/codeship-services.yml
diff --git a/17.caching/codeship-steps.yml b/17.caching/codeship-steps.yml
diff --git a/18.load-balancer/Dockerfile.app b/18.load-balancer/Dockerfile.app
diff --git a/18.load-balancer/Dockerfile.ci b/18.load-balancer/Dockerfile.ci
diff --git a/18.load-balancer/Dockerfile.lb b/18.load-balancer/Dockerfile.lb
diff --git a/18.load-balancer/README.md b/18.load-balancer/README.md
diff --git a/18.load-balancer/app.go b/18.load-balancer/app.go
diff --git a/18.load-balancer/codeship-services.yml b/18.load-balancer/codeship-services.yml
diff --git a/18.load-balancer/codeship-steps.yml b/18.load-balancer/codeship-steps.yml
diff --git a/18.load-balancer/nginx.conf b/18.load-balancer/nginx.conf