Merge pull request #25 from mtsmfm/remove-sync

Stop using docker-sync

Author: mtsmfm

.gitignore

@@ -9,4 +9,3 @@
 /tmp/
 /vendor/bundle/
 /node_modules/
-/.docker-sync

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Not released
 
 - Add binstub bin/language_server-ruby
+- Stop using docker-sync for development
 
 ## 0.6.0
 

Dockerfile.development

@@ -1,12 +1,12 @@
-ARG RUBY_VERSION=2.4.2
+ARG RUBY_VERSION=
 FROM ruby:$RUBY_VERSION
 
 RUN apt-get update && apt-get install less -y
 RUN groupadd --gid 1000 ruby && useradd --uid 1000 --gid ruby --shell /bin/bash --create-home ruby
-RUN mkdir /app && chown ruby:ruby /app
+RUN mkdir /app /vendor && chown -R ruby:ruby /app /vendor
 
 ENV LANG=C.UTF-8 \
-  BUNDLE_PATH=/app/vendor/bundle/$RUBY_VERSION \
+  BUNDLE_PATH=/vendor/bundle/$RUBY_VERSION \
   BUNDLE_JOBS=4
 
 USER ruby

README.md

@@ -48,15 +48,10 @@ Currently, language_server-ruby supports only stdio to communicate.
 
 https://docs.docker.com/engine/installation
 
-#### docker-sync
-
-https://github.com/EugenMayer/docker-sync/wiki/1.-Installation
-
 ### Setup
 
     $ git clone https://github.com/mtsmfm/language_server-ruby.git
     $ cd language_server-ruby
-    $ docker-sync start
     $ docker-compose run app bin/setup
 
 ### Run test

circle.yml

@@ -4,6 +4,7 @@ jobs:
     docker:
       - image: tmaier/docker-compose
         environment:
+          COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
           SERVICE_NAME: ruby-2-4
     steps:
       - checkout
@@ -13,23 +14,27 @@ jobs:
           name: setup
           command: |
             set -x
-            docker volume create mtsmfm-language-server-sync
-            docker create -v mtsmfm-language-server-sync:/app --name mtsmfm-language-server-sync busybox chown -R 1000:1000 /app
-            docker cp . mtsmfm-language-server-sync:/app
-            docker start mtsmfm-language-server-sync
+            docker info
+            docker volume create project
+            docker create -v project:/app --name project busybox chown -R 1000:1000 /app
+            docker cp . project:/app
+            docker start project
+            docker-compose build $SERVICE_NAME
       - run: docker-compose run $SERVICE_NAME bin/setup
       - run: docker-compose run $SERVICE_NAME bin/m
   test-2-3:
     <<: *test
     docker:
       - image: tmaier/docker-compose
         environment:
+          COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
           SERVICE_NAME: ruby-2-3
   test-2-2:
     <<: *test
     docker:
       - image: tmaier/docker-compose
         environment:
+          COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
           SERVICE_NAME: ruby-2-2
 workflows:
   version: 2

docker-compose.ci.yml

@@ -0,0 +1,14 @@
+version: '3.0'
+services:
+  app: &app
+    volumes:
+      - project:/app
+  ruby-2-4:
+    <<: *app
+  ruby-2-3:
+    <<: *app
+  ruby-2-2:
+    <<: *app
+volumes:
+  project:
+    external: true

docker-compose.override.yml

@@ -0,0 +1,14 @@
+version: '3.0'
+services:
+  app: &app
+    volumes:
+      - .:/app:cached
+      - $HOME/.gitconfig:/home/ruby/.gitconfig:ro
+      - $HOME/.ssh:/home/ruby/.ssh:ro
+      - $HOME/.gem:/home/ruby/.gem
+  ruby-2-4:
+    <<: *app
+  ruby-2-3:
+    <<: *app
+  ruby-2-2:
+    <<: *app

docker-compose.yml

@@ -4,14 +4,13 @@ services:
     build: &app-build
       context: .
       dockerfile: Dockerfile.development
+      args:
+        RUBY_VERSION: 2.4.2
     environment:
       LANGUAGE_SERVER_RUBY_REMOTE_ROOT: $PWD
     volumes:
-      - mtsmfm-language-server-sync:/app:nocopy
+      - vendor:/vendor
       - home:/home/ruby
-      - $HOME/.gitconfig:/home/ruby/.gitconfig:ro
-      - $HOME/.ssh:/home/ruby/.ssh:ro
-      - $HOME/.gem:/home/ruby/.gem
   ruby-2-4:
     <<: *app
   ruby-2-3:
@@ -27,6 +26,5 @@ services:
       args:
         RUBY_VERSION: 2.2.7
 volumes:
-  mtsmfm-language-server-sync:
-    external: true
   home:
+  vendor: