Skip to content

Commit

Permalink
3.0.0 (#34)
Browse files Browse the repository at this point in the history
* 3.0.0
* add zoo
* update changelog
  • Loading branch information
patr1ckm authored Jun 21, 2019
1 parent 69ece0b commit a8a10a5
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 6 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ Version number changes (major.minor.micro) in this package denote the following:
- A minor version will increase if one or more packages contained in the Docker image add new, backwards-compatible features, or if a new package is added to the Docker image.
- A major version will increase if there are any backwards-incompatible changes in any of the packages contained in this Docker image, or any other backwards-incompabile changes in the execution environment.

# [3.0.0] - 2019-06-21

- rocker/verse -> 3.5.3
- civis-r -> 2.0.0
- civis-python -> 1.10.0
- added `requirements.txt`
- added package `zoo`

## [2.8.0] - 2019-02-12

- rocker/verse -> 3.5.2
Expand Down
13 changes: 8 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rocker/verse:3.5.2
FROM rocker/verse:3.5.3
MAINTAINER [email protected]

RUN DEBIAN_FRONTEND=noninteractive apt-get update -y --no-install-recommends && \
Expand All @@ -16,11 +16,14 @@ RUN curl -s https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
rm -rf ~/.cache/pip && \
rm -f get-pip.py

RUN Rscript -e "devtools::install_github('civisanalytics/civis-r', ref = 'v1.6.1', upgrade_dependencies = FALSE);"
RUN Rscript -e "devtools::install_github('civisanalytics/civis-r', ref = 'v2.0.0', upgrade_dependencies = FALSE);"

COPY ./requirements.txt /requirements.txt
RUN Rscript -e 'install.packages(readLines("requirements.txt"))'

RUN Rscript -e "library(civis)"

ENV VERSION=2.8.0 \
VERSION_MAJOR=2 \
VERSION_MINOR=8 \
ENV VERSION=3.0.0 \
VERSION_MAJOR=3 \
VERSION_MINOR=0 \
VERSION_MICRO=0
2 changes: 1 addition & 1 deletion requirements-python.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
civis==1.9.3
civis==1.10.0
pubnub==4.0.12
joblib==0.11
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
zoo

0 comments on commit a8a10a5

Please sign in to comment.