Skip to content

Commit

Permalink
Merge branch 'release/0.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
vst committed Jul 4, 2016
2 parents 5c5a423 + 6467d8f commit 7417f74
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
9 changes: 8 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
VERS: 2016-02-16 ------- release/0.0.2
VERS: 2016-07-04 ------- release/0.0.3

* 2016-07-04 84ffce8 [release] Version bumped to 0.0.3 (vst@vsthost.com)
* 2016-07-04 f9d2f73 [chore] Upgraded to Ubuntu 16.04 and OpenCPU 1.6 (vst@vsthost.com)
* 2016-02-16 5b238f1 [chore] Development version bumped to 0.0.3-SNAPSHOT (vst@vsthost.com)

VERS: 2016-02-16 b902672 release/0.0.2 (vst@vsthost.com)

* 2016-02-16 327a21e [release] Change log updated (vst@vsthost.com)
* 2016-02-16 aa6dfc5 [release] Version bumped to 0.0.2 (vst@vsthost.com)
* 2016-02-16 45112d9 [feature] Added some required R libraries (vst@vsthost.com)
* 2016-02-15 da4a60f [chore] Using a more recent version of pandoc instead of 1.12.etc. (vst@vsthost.com)
Expand Down
16 changes: 5 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,21 @@
## Using the official ubuntu image:
FROM ubuntu:14.04
FROM ubuntu:16.04

## Preamble:
MAINTAINER Vehbi Sinan Tunalioglu <vst@vsthost.com>

## Define versions required:
ENV VERSION 0.0.2
ENV VERSION 0.0.3
ENV VERSION_OPENCPU 1.6

## Prepare apt-get:
RUN echo "debconf debconf/frontend select Noninteractive" | debconf-set-selections && \
apt-get update && \
apt-get -y dist-upgrade && \
apt-get install -y software-properties-common && \
sudo add-apt-repository -y ppa:opencpu/opencpu-1.5 && \
add-apt-repository -y ppa:opencpu/opencpu-${VERSION_OPENCPU} && \
apt-get update -qy && \
apt-get install -qy \
nano \
unzip \
pandoc \
wget \
opencpu \
littler && \
wget -O /tmp/pandoc.deb https://github.com/jgm/pandoc/releases/download/1.16.0.2/pandoc-1.16.0.2-1-amd64.deb && dpkg -i /tmp/pandoc.deb && rm /tmp/pandoc.deb && \
apt-get install -qy nano unzip pandoc wget opencpu littler && \
apt-get clean autoclean && \
apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
Expand Down

0 comments on commit 7417f74

Please sign in to comment.