Clone taskers from mantor/taskers in flack's dockerfile and remove ta…

…skers from the tree (#62) * Remove debug message * Remove taskers from tree and clone from mantor/taskers
mantor · Jan 3, 2021 · 8bd1a3a · 8bd1a3a
1 parent 5274bf6
commit 8bd1a3a
Show file tree

Hide file tree

Showing 15 changed files with 3 additions and 177 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,11 +17,6 @@ before_install:
   - CONTAINER_IP=`docker inspect $CONTAINER | grep '"IPAddress"' | head -n 1 | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}"`
   - ip addr
   - HOST_IP=`ip a s ens4 | egrep -o 'inet [0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | cut -d' ' -f2`
-  - echo
-  - echo
-  - echo $HOST_IP
-  - echo
-  - echo
   - docker exec $CONTAINER sed -i "s#:\/\/localhost#:\/\/$HOST_IP#g" /flack/envs/dev/lib/taskers/web/tasker.rb
 
 before_script:

diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@ EXPOSE 7007:7007
 
 RUN apt-get update && apt-get install git
 RUN git clone https://github.com/floraison/flack
-# Temporarily
-COPY ./taskers  flack/envs/dev/lib/taskers
+RUN rm -rf /flack/envs/dev/lib/taskers
+RUN git clone https://github.com/mantor/taskers /flack/envs/dev/lib/taskers
 RUN sed -i 's/bundle exec rackup -p $(PORT)/bundle exec rackup -p $(PORT) --host 0.0.0.0/g' flack/Makefile
-RUN cd flack && bundle install && make migrate
+RUN cd flack && bundle install && make migrate
diff --git a/taskers/.gitkeep b/taskers/.gitkeep
diff --git a/taskers/alice/dot.json b/taskers/alice/dot.json
diff --git a/taskers/alice/tasker.rb b/taskers/alice/tasker.rb
diff --git a/taskers/bob/dot.json b/taskers/bob/dot.json
diff --git a/taskers/bob/tasker.rb b/taskers/bob/tasker.rb
diff --git a/taskers/charlie/dot.json b/taskers/charlie/dot.json
diff --git a/taskers/charlie/tasker.rb b/taskers/charlie/tasker.rb
diff --git a/taskers/dan/dot.json b/taskers/dan/dot.json
diff --git a/taskers/dan/tasker.rb b/taskers/dan/tasker.rb
diff --git a/taskers/ssh/dot.json b/taskers/ssh/dot.json
diff --git a/taskers/ssh/tasker.rb b/taskers/ssh/tasker.rb
diff --git a/taskers/web/dot.json b/taskers/web/dot.json
diff --git a/taskers/web/tasker.rb b/taskers/web/tasker.rb