Skip to content

Commit 7d1a2fa

Browse files
authored
Merge pull request #249 from bird-house/fix-dockerfile-prep-0.9.2
Rewrite dockerfile - prep 0.9.2
2 parents cb06957 + f9a4a2c commit 7d1a2fa

File tree

6 files changed

+17
-26
lines changed

6 files changed

+17
-26
lines changed

.cruft.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"project_repo_name": "finch",
2323
"project_readthedocs_name": "finch",
2424
"project_short_description": "A Web Processing Service for Climate Indicators.",
25-
"version": "0.9.1",
25+
"version": "0.9.2",
2626
"open_source_license": "Apache Software License 2.0",
2727
"http_port": "5000",
2828
"_copy_without_render": [

Dockerfile

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
11
# vim:set ft=dockerfile:
2-
FROM continuumio/miniconda3
2+
FROM condaforge/mambaforge
33
MAINTAINER https://github.com/bird-house/finch
4-
LABEL Description="Finch WPS" Vendor="Birdhouse" Version="0.9.1"
5-
6-
# Update Debian system
7-
RUN apt-get update && apt-get install -y \
8-
build-essential git \
9-
&& rm -rf /var/lib/apt/lists/* \
10-
&& conda update conda -n base \
11-
&& conda install mamba -n base -c conda-forge -c defaults
4+
LABEL Description="Finch WPS" Vendor="Birdhouse" Version="0.9.2"
125

136
WORKDIR /code
147

158
COPY environment.yml .
16-
RUN conda config --add channels conda-forge \
17-
&& mamba env create -n finch -f environment.yml \
18-
&& mamba install -c conda-forge -n finch gunicorn psycopg2 \
19-
&& rm -rf /opt/conda/pkgs/*
9+
RUN mamba env create -n finch -f environment.yml \
10+
&& mamba install -n finch gunicorn psycopg2 \
11+
&& mamba clean -ay
2012

2113
COPY . .
2214

2315
ENV PATH /opt/conda/envs/finch/bin:$PATH
2416

2517
EXPOSE 5000
2618

27-
CMD ["gunicorn", "--bind=0.0.0.0:5000", "finch.wsgi:application"]
19+
CMD ["gunicorn", "--bind=0.0.0.0:5000", "-t 60", "finch.wsgi:application"]

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@
109109
# the built documents.
110110
#
111111
# The short X.Y version.
112-
version = "0.9.1"
112+
version = "0.9.2"
113113
# The full version, including alpha/beta/rc tags.
114-
release = "0.9.1"
114+
release = "0.9.2"
115115

116116
# The language for content autogenerated by Sphinx. Refer to documentation
117117
# for a list of supported languages.

docs/source/notebooks/subset.ipynb

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

finch/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
__author__ = """David Huard"""
88
__email__ = "[email protected]"
9-
__version__ = '0.9.1'
9+
__version__ = '0.9.2'

setup.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.9.1
2+
current_version = 0.9.2
33
commit = True
44
tag = True
55

@@ -45,4 +45,3 @@ exclude =
4545
[doc8]
4646
ignore-path = docs/build,docs/source/_templates,docs/source/_static
4747
max-line-length = 120
48-

0 commit comments

Comments
 (0)