Skip to content

Commit

Permalink
Merge pull request #4 from WikiWatershed/tt/1/upgrade-docker-image
Browse files Browse the repository at this point in the history
  • Loading branch information
rajadain authored Jul 12, 2024
2 parents bb8a7ef + 3f06c63 commit dc4a124
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:14.04
FROM ubuntu:16.04

MAINTAINER Azavea <[email protected]>

Expand All @@ -19,7 +19,7 @@ RUN apt-get update && apt-get install -y \
libgeos-dev \
libproj-dev \
libspatialite-dev \
libspatialite5 \
libspatialite7 \
spatialite-bin \
libibnetdisc-dev \
wget
Expand Down Expand Up @@ -49,4 +49,4 @@ RUN wget -qO- https://github.com/dtarb/TauDEM/archive/v${TAUDEM_VERSION}.tar.gz
RUN ln -s /usr/src/TauDEM-${TAUDEM_VERSION} /opt/taudem
ENV PATH /opt/taudem:$PATH

RUN pip install --upgrade pip
RUN pip install --upgrade "pip<21"
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# docker-taudem

[![Travis CI](https://api.travis-ci.org/WikiWatershed/docker-taudem.svg "Build Status on Travis CI")](https://travis-ci.org/WikiWatershed/docker-taudem/)
[![Docker Repository on Quay.io](https://quay.io/repository/wikiwatershed/taudem/status "Docker Repository on Quay.io")](https://quay.io/repository/wikiwatershed/taudem)
[![Apache V2 License](http://img.shields.io/badge/license-Apache%20V2-blue.svg)](https://github.com/wikiwatershed/docker-taudem/blob/develop/LICENSE)

Expand All @@ -23,7 +22,5 @@ $ git flow release start 0.1.0
$ vim CHANGELOG.md
$ vim Dockerfile
$ git commit -m "0.1.0"
$ git flow release publish 0.1.0
$ git flow release finish 0.1.0
$ git push --tags
$ git flow release finish -p 0.1.0
```
7 changes: 6 additions & 1 deletion scripts/console.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,9 @@ set -ex

ARGS=$*

docker run --rm -ti docker-taudem $ARGS
if [[ -z $CI ]]; then
docker run --rm -ti docker-taudem $ARGS
else
# Run in non-interactive mode in CI
docker run --rm docker-taudem $ARGS
fi

0 comments on commit dc4a124

Please sign in to comment.