oops, rvm install is needed; also make kill rm container

rubys · Mar 20, 2019 · b3da9c6 · b3da9c6
1 parent d726df2
commit b3da9c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/setup/Dockerfile b/setup/Dockerfile
@@ -35,6 +35,9 @@ RUN apt-get install -y \
   libpq-dev \
   zlib1g-dev
 
+RUN /bin/bash -l -c "rvm install 2.6.2" &&\
+  /bin/bash -l -c "rvm use 2.6.2"
+
 WORKDIR /home/awdwr
 ENV HOME /home/awdwr
 ENV USER awdwr

diff --git a/setup/Rakefile b/setup/Rakefile
@@ -141,12 +141,12 @@ namespace :awdwr do
     next unless `docker ps`.include? 'awdwr-main'
     container=`docker ps -q --filter name=awdwr-main`.chomp
     system "docker container kill #{container}" unless container.empty?
-  end
 
-  task :clean => :kill do
     container=`docker ps -aq --filter name=awdwr-main`.chomp
     system "docker container rm #{container}" unless container.empty?
+  end
 
+  task :clean => :kill do
     if `docker image ls`.include? 'awdwr-main'
       system "docker image rm awdwr-main"
     end