Skip to content

Commit

Permalink
Merge pull request #249 from bird-house/fix-dockerfile-prep-0.9.2
Browse files Browse the repository at this point in the history
Rewrite dockerfile - prep 0.9.2
  • Loading branch information
aulemahal authored Jul 19, 2022
2 parents cb06957 + f9a4a2c commit 7d1a2fa
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .cruft.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"project_repo_name": "finch",
"project_readthedocs_name": "finch",
"project_short_description": "A Web Processing Service for Climate Indicators.",
"version": "0.9.1",
"version": "0.9.2",
"open_source_license": "Apache Software License 2.0",
"http_port": "5000",
"_copy_without_render": [
Expand Down
20 changes: 6 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,19 @@
# vim:set ft=dockerfile:
FROM continuumio/miniconda3
FROM condaforge/mambaforge
MAINTAINER https://github.com/bird-house/finch
LABEL Description="Finch WPS" Vendor="Birdhouse" Version="0.9.1"

# Update Debian system
RUN apt-get update && apt-get install -y \
build-essential git \
&& rm -rf /var/lib/apt/lists/* \
&& conda update conda -n base \
&& conda install mamba -n base -c conda-forge -c defaults
LABEL Description="Finch WPS" Vendor="Birdhouse" Version="0.9.2"

WORKDIR /code

COPY environment.yml .
RUN conda config --add channels conda-forge \
&& mamba env create -n finch -f environment.yml \
&& mamba install -c conda-forge -n finch gunicorn psycopg2 \
&& rm -rf /opt/conda/pkgs/*
RUN mamba env create -n finch -f environment.yml \
&& mamba install -n finch gunicorn psycopg2 \
&& mamba clean -ay

COPY . .

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

EXPOSE 5000

CMD ["gunicorn", "--bind=0.0.0.0:5000", "finch.wsgi:application"]
CMD ["gunicorn", "--bind=0.0.0.0:5000", "-t 60", "finch.wsgi:application"]
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@
# the built documents.
#
# The short X.Y version.
version = "0.9.1"
version = "0.9.2"
# The full version, including alpha/beta/rc tags.
release = "0.9.1"
release = "0.9.2"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
12 changes: 6 additions & 6 deletions docs/source/notebooks/subset.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion finch/__version__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

__author__ = """David Huard"""
__email__ = "[email protected]"
__version__ = '0.9.1'
__version__ = '0.9.2'
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.9.1
current_version = 0.9.2
commit = True
tag = True

Expand Down Expand Up @@ -45,4 +45,3 @@ exclude =
[doc8]
ignore-path = docs/build,docs/source/_templates,docs/source/_static
max-line-length = 120

0 comments on commit 7d1a2fa

Please sign in to comment.