From 71f7d823fed1ec2bdf2db6c1a7234cefa44f98d4 Mon Sep 17 00:00:00 2001
From: Vadim Prishlyak <vadim.prishlyak@t-systems.ru>
Date: Thu, 11 Jul 2019 00:09:38 +0300
Subject: [PATCH] Use node:10-stretch as base image, change dockerhub image
 name, use latest tool version

---
 Dockerfile               | 12 +++++++-----
 docker-compose.setup.yml |  4 ++--
 docker-compose.yml       |  3 ++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e815e38..510d9f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
-FROM node:4-wheezy
+FROM node:10-stretch
 
 ENV AAT_VER=0.2.2
 
-MAINTAINER Gary Ritchie <gary@garyritchie.com>
+MAINTAINER Vadim Prishlyak
 
 RUN apt-get update && apt-get install -y \
     build-essential \
-    ffmpeg \
+    ffmpeg libavcodec-dev libavdevice-dev\
     git \
     libssl-dev \
   && rm -rf /var/lib/apt/lists/*
@@ -17,12 +17,14 @@ RUN npm install -g pm2 \
   && npm install -g adapt-cli
 
 RUN cd / \
-  && git clone --branch v${AAT_VER} https://github.com/adaptlearning/adapt_authoring.git
+  && git clone https://github.com/adaptlearning/adapt_authoring.git
 
 WORKDIR /adapt_authoring
 
 RUN npm install --production
 
+RUN npm install
+
 ## Currently have to run this within container so we can link to running mongodb container...
 ## docker run -it -P --link adaptdb --name adapt adaptframework bash
 #RUN node install --install Y --serverPort 5000 --serverName localhost --dbHost adaptdb \
@@ -32,7 +34,7 @@ RUN npm install --production
   # --name master --displayName Master --email admin --password password
 
 # upgrade the AuthoringTool and or Framework
-# RUN node upgrade --Y/n Y
+RUN node upgrade --Y/n Y
 
 # guest: 5000, host: 5000
 # guest: 5858, host: 5858
diff --git a/docker-compose.setup.yml b/docker-compose.setup.yml
index b394fa8..6004951 100644
--- a/docker-compose.setup.yml
+++ b/docker-compose.setup.yml
@@ -7,8 +7,8 @@ volumes:
 
 services:
   setup:
-    # build: .
-    image: garyritchie/docker-adaptauthoring:0.2.2
+    #build: .
+    image: pvadimr/adaptauttoring:latest
     container_name: adaptauthoring
     # extends:
     #   file: docker-compose.yml
diff --git a/docker-compose.yml b/docker-compose.yml
index 059ce2d..053955e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,8 @@ services:
     #   - 27017:27017
   authoring:
     container_name: adaptauthoring
-    image: garyritchie/docker-adaptauthoring:0.2.2
+    #build: .
+    image: pvadimr/adaptauttoring:latest
     volumes:
       - adaptdata:/adapt_authoring
     # build: .