Remove docker-sync

.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/node_modules

Dockerfile-node.development

@@ -1,6 +1,6 @@
 FROM node:6-alpine
 
-RUN mkdir /app && chown node:node /app
+RUN mkdir /app /vendor && chown node:node /app /vendor
 
 USER node
 WORKDIR /app

Dockerfile.development

@@ -1,14 +1,24 @@
-ARG RUBY_VERSION=2.4.1
+ARG RUBY_VERSION=2.4.2
 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 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
 
+ENV ENTRYKIT_VERSION 0.4.0
+
+RUN wget https://github.com/progrium/entrykit/releases/download/v${ENTRYKIT_VERSION}/entrykit_${ENTRYKIT_VERSION}_Linux_x86_64.tgz \
+  && tar -xvzf entrykit_${ENTRYKIT_VERSION}_Linux_x86_64.tgz \
+  && rm entrykit_${ENTRYKIT_VERSION}_Linux_x86_64.tgz \
+  && mv entrykit /bin/entrykit \
+  && chmod +x /bin/entrykit \
+  && entrykit --symlink
+
 USER ruby
 WORKDIR /app
-CMD ["bundle", "exec", "exe/language_server"]
+
+ENTRYPOINT ["prehook", "bin/setup", "--"]

bin/setup

@@ -3,6 +3,4 @@ set -euo pipefail
 IFS=$'\n\t'
 set -vx
 
-bundle install
-
-# Do any other automated setup that you need to do here
+bundle check || bundle install

circle.yml

@@ -3,7 +3,8 @@ jobs:
   build:
     docker:
       - image: tmaier/docker-compose
-    working_directory: /project
+        environment:
+          COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
     steps:
       - checkout
       - setup_remote_docker:
@@ -13,11 +14,14 @@ jobs:
           command: |
             set -x
             docker info
-            docker volume create mtsmfm-language-server-protocol-sync
-            docker create -v mtsmfm-language-server-protocol-sync:/app --name mtsmfm-language-server-protocol-sync busybox chown -R 1000:1000 /app
-            docker cp . mtsmfm-language-server-protocol-sync:/app
-            docker start mtsmfm-language-server-protocol-sync
+            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
-            docker-compose run app bin/setup
-            docker-compose run ruby-2-3 bin/setup
-            docker-compose run ruby-2-2 bin/setup
+      - run:
+          name: test
+          command: |
+            docker-compose run app bundle exec rake test
+            docker-compose run ruby-2-3 bundle exec rake test
+            docker-compose run ruby-2-2 bundle exec rake test

docker-compose.ci.yml

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

docker-compose.override.yml

@@ -0,0 +1,15 @@
+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-3:
+    <<: *app
+  ruby-2-2:
+    <<: *app
+  node:
+    volumes:
+      - .:/app:cached

docker-compose.yml

@@ -5,31 +5,27 @@ services:
       context: .
       dockerfile: Dockerfile.development
     volumes:
-      - mtsmfm-language-server-protocol-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-3:
     <<: *app
     build:
       <<: *app-build
       args:
-        RUBY_VERSION: 2.3
+        RUBY_VERSION: 2.3.5
   ruby-2-2:
     <<: *app
     build:
       <<: *app-build
       args:
-        RUBY_VERSION: 2.2
+        RUBY_VERSION: 2.2.8
   node:
     build:
       context: .
       dockerfile: Dockerfile-node.development
     volumes:
-      - mtsmfm-language-server-protocol-sync:/app:nocopy
+      - vendor:/vendor
       - home:/home/node
 volumes:
-  mtsmfm-language-server-protocol-sync:
-    external: true
+  vendor:
   home: