Use node:10-stretch as base image, change dockerhub image name, use latest tool version

This commit is contained in:
Vadim Prishlyak 2019-07-11 00:09:38 +03:00
parent 1af8bde28f
commit 71f7d823fe
3 changed files with 11 additions and 8 deletions

View File

@ -1,12 +1,12 @@
FROM node:4-wheezy FROM node:10-stretch
ENV AAT_VER=0.2.2 ENV AAT_VER=0.2.2
MAINTAINER Gary Ritchie <gary@garyritchie.com> MAINTAINER Vadim Prishlyak
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
build-essential \ build-essential \
ffmpeg \ ffmpeg libavcodec-dev libavdevice-dev\
git \ git \
libssl-dev \ libssl-dev \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
@ -17,12 +17,14 @@ RUN npm install -g pm2 \
&& npm install -g adapt-cli && npm install -g adapt-cli
RUN cd / \ 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 WORKDIR /adapt_authoring
RUN npm install --production RUN npm install --production
RUN npm install
## Currently have to run this within container so we can link to running mongodb container... ## 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 ## docker run -it -P --link adaptdb --name adapt adaptframework bash
#RUN node install --install Y --serverPort 5000 --serverName localhost --dbHost adaptdb \ #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 # --name master --displayName Master --email admin --password password
# upgrade the AuthoringTool and or Framework # upgrade the AuthoringTool and or Framework
# RUN node upgrade --Y/n Y RUN node upgrade --Y/n Y
# guest: 5000, host: 5000 # guest: 5000, host: 5000
# guest: 5858, host: 5858 # guest: 5858, host: 5858

View File

@ -8,7 +8,7 @@ volumes:
services: services:
setup: setup:
#build: . #build: .
image: garyritchie/docker-adaptauthoring:0.2.2 image: pvadimr/adaptauttoring:latest
container_name: adaptauthoring container_name: adaptauthoring
# extends: # extends:
# file: docker-compose.yml # file: docker-compose.yml

View File

@ -14,7 +14,8 @@ services:
# - 27017:27017 # - 27017:27017
authoring: authoring:
container_name: adaptauthoring container_name: adaptauthoring
image: garyritchie/docker-adaptauthoring:0.2.2 #build: .
image: pvadimr/adaptauttoring:latest
volumes: volumes:
- adaptdata:/adapt_authoring - adaptdata:/adapt_authoring
# build: . # build: .