Update Docker images; remove Docker.dev (kriasoft#26)

koistya · web-flow · commit e90a0a5c6bf4 · 2017-03-14T16:32:37.000Z
Fix kriasoft#24, close kriasoft#25
diff --git a/.dockerignore b/.dockerignore
@@ -7,6 +7,5 @@ test
 CONTRIBUTING.md
 docker-compose.yml
 Dockerfile
-Dockerfile.dev
 LICENSE.txt
 README.md
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,24 @@
+dist: trusty
 sudo: required
-
 language: generic
 
-services:
-  - docker
+env:
+  - DOCKER_COMPOSE_VERSION: 1.11.2
 
-cache:
-  directories:
-    - node_modules
+cache: yarn
 
 before_install:
+  # Install the latest version of Docker
+  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+  - sudo apt-get -qq update
+  - sudo apt-get install -qqy docker-ce
+  # Install Docker Compose
+  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - chmod +x docker-compose
+  - sudo mv docker-compose /usr/local/bin
+
+before_script:
   - cp .env.example .env
   - docker-compose up -d
   - docker-compose logs -f api | while read line; do
diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,12 @@
-FROM node:7.4.0-alpine
+FROM node:7.7.2-alpine
 
 # Set a working directory
 WORKDIR /usr/src/app
 
 # Copy application files
 COPY . .
 
-# Install Yarn and Node.js dependencies
-RUN npm install yarn --global --no-progress --silent --depth 0 && \
-    yarn install --production --no-progress
+# Install Node.js dependencies
+RUN yarn install --production --no-progress
 
 CMD [ "node", "build/server.js" ]
diff --git a/Dockerfile.dev b/Dockerfile.dev
diff --git a/README.md b/README.md
@@ -43,15 +43,14 @@ meant to be paired with a web and/or mobile application project such as [React S
 ├── .env.example                # Available application settings as a reference
 ├── docker-compose.yml          # Defines Docker services, networks and volumes
 ├── Dockerfile                  # Commands for building a Docker image for production
-├── Dockerfile.dev              # Commands for building a Docker image for development
 ├── package.json                # The list of project dependencies
 └── yarn.lock                   # Fixed versions of all the dependencies
 ```
 
 
 ## Getting Started
 
-Make sure that you have [Docker][docker] v1.12.5 or newer installed plus a good text editor or IDE
+Make sure that you have [Docker][docker] v17 or newer installed plus a good text editor or IDE
 ([VS Code][code], [WebStorm][wstorm] or another), clone the repo and launch the app with [Docker
 Compose][compose]:
 
@@ -182,7 +181,7 @@ Made with ♥ by Konstantin Tarkus ([@koistya](https://twitter.com/koistya), [bl
 [do]: https://m.do.co/c/eef302dbae9f
 [code]: https://code.visualstudio.com/
 [wstorm]: https://www.jetbrains.com/webstorm/
-[docker]: https://www.docker.com/products/docker
+[docker]: https://www.docker.com/community-edition
 [compose]: https://docs.docker.com/compose/
 [v8debug]: https://chromedevtools.github.io/debugger-protocol-viewer/v8/
 [vsdebug]: https://code.visualstudio.com/Docs/editor/debugging
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,11 +1,9 @@
-version: '2'
+version: '3'
 
 services:
 
   api:
-    build:
-      context: .
-      dockerfile: ./Dockerfile.dev
+    image: node:7.7.2-alpine
     restart: always
     env_file: .env
     links:
@@ -21,18 +19,18 @@ services:
     command: node scripts/run.js
 
   postgres:
-    image: postgres:9.6.1-alpine
+    image: postgres:9.6.2-alpine
     restart: always
     read_only: true
     tmpfs:
-      - /run/postgresql
       - /tmp
+      - /var/run/postgresql
     volumes:
       - postgres:/var/lib/postgresql/data
       - ./scripts/postgres-init.sh:/docker-entrypoint-initdb.d/init.sh
 
   redis:
-    image: redis:3.2.6-alpine
+    image: redis:3.2.8-alpine
     restart: always
     read_only: true
     volumes:
