summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-10-12 13:38:07 +0200
committervarac <varacanero@zeromail.org>2016-10-12 13:38:07 +0200
commit4171b2eaee44ec5ea632acdc8703f9c8980d9200 (patch)
treecab7cff35292cc53d6d14838a983a5b9791328c7 /docker
parent538a2ee40b46d4a4c29b05d866d0f36a834e4d1d (diff)
Add moreutils and expect for ci builds
Diffstat (limited to 'docker')
-rw-r--r--docker/README.md8
-rw-r--r--docker/ruby/Dockerfile4
2 files changed, 9 insertions, 3 deletions
diff --git a/docker/README.md b/docker/README.md
index 0721b34..4272776 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,10 +1,14 @@
# Build
+As an example we build a new version (2.2.0) of the leapcode/ruby image:
+
cd ruby
- docker build -t leapcode/ruby:2.1-slim .
+ docker build -t leapcode/ruby:2.2.0 .
# Push images
docker logout
docker login -u leapcode
- docker push leapcode/ruby:2.1-slim
+ docker push leapcode/ruby:2.2.0
+ docker tag leapcode/ruby:2.2.0 leapcode/ruby:latest
+ docker push leapcode/ruby:latest
diff --git a/docker/ruby/Dockerfile b/docker/ruby/Dockerfile
index 44cd04e..0f8d621 100644
--- a/docker/ruby/Dockerfile
+++ b/docker/ruby/Dockerfile
@@ -7,9 +7,11 @@ LABEL Description="Ruby 2.1 including sudo and build tools to build leap_cli etc
# for unknown reason, "rake install" fails in docker, even if the userid is 0
# so we need to install sudo to use "sudo rake install"
+RUN sed -i 's/httpredir/deb/' /etc/apt/sources.list
RUN apt-get update
RUN apt-get -y install sudo
# install leap_cli prerequisites, see https://0xacab.org/leap/leap_cli
-RUN apt-get -y install git ruby ruby-dev rsync openssh-client openssl rake gcc make zlib1g-dev
+# and tools needed for ci (moreutils and expect)
+RUN apt-get -y install git ruby ruby-dev rsync openssh-client openssl rake gcc make zlib1g-dev moreutils expect