Skip to content

Commit

Permalink
Update Dockerfile with Biocontainers template
Browse files Browse the repository at this point in the history
  • Loading branch information
pierrepo committed Aug 18, 2021
1 parent 17fc1b2 commit b4d86d9
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 11 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
**Dev**
- Update Dockerfile with Biocontainers template

**2.1.0**
- Fix style in help/documentation
Expand Down
31 changes: 21 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
################## BASE IMAGE ######################
FROM ubuntu:20.04

################### METADATA #######################
LABEL base_image="ubuntu:20.04"
LABEL version="4"
LABEL software="autoclassweb"
LABEL software.version="2.1.0"
LABEL about.summary="A web app to run AutoClass C Bayesian clustering"
LABEL about.home="https://github.com/pierrepo/autoclassweb"
LABEL about.documentation="https://github.com/pierrepo/autoclassweb"
LABEL about.license_file="https://github.com/pierrepo/autoclassweb/blob/master/LICENSE.txt"
LABEL about.license="SPDX:BSD-3-Clause"
LABEL extra.identifiers.biotools="autoclassweb"
LABEL about.tags="Genomics Proteomics Omics Clustering Classification"

################## MAINTAINER ######################
LABEL maintainer="Pierre Poulain <[email protected]>"

# Change default shell
Expand All @@ -9,6 +25,7 @@ ENV LANG C.UTF-8

RUN apt update && \
apt -y upgrade && \
apt install -y git && \
apt install -y wget && \
apt install -y libc6-i386 && \
apt autoremove -y && \
Expand All @@ -18,13 +35,8 @@ RUN apt update && \
# Create app directory
WORKDIR /app

# Install app files
COPY environment-lock.yml ./
COPY flaskapp ./flaskapp
COPY config.py ./
COPY gunicorn.py ./
COPY export_results.py ./

# Download source code
RUN git clone --depth 1 https://github.com/pierrepo/autoclassweb.git /app

# Install conda
# See https://hub.docker.com/r/conda/miniconda3/dockerfile
Expand All @@ -34,7 +46,6 @@ RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-py38_4.9.2-Linux
rm -f /tmp/miniconda.sh && \
conda update conda


# Install conda env
ARG conda_env=autoclassweb
RUN conda env create -f environment-lock.yml && \
Expand All @@ -57,5 +68,5 @@ VOLUME /app/logs
VOLUME /app/results
EXPOSE 5000

# CMD ["gunicorn", "--config", "gunicorn.py", "flaskapp:app"]

# Run the web app
#CMD ["gunicorn", "--config", "gunicorn.py", "flaskapp:app"]
2 changes: 1 addition & 1 deletion devtools/RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ After the creation of the new release in GitHub, check the archive has been crea

## Publish docker image

Docker images of autoclassweb are hosted in the [Biocontainers](https://biocontainers.pro/) docker repo:
Docker images of AutoClassWeb are hosted in the [Biocontainers](https://biocontainers.pro/) docker repository:

<https://hub.docker.com/r/biocontainers/autoclassweb>

Expand Down
2 changes: 2 additions & 0 deletions devtools/bumpversion.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ current_version = 2.1.0

[bumpversion:file:.zenodo.json]

[bumpversion:file:Dockerfile]

[bumpversion:file:CHANGELOG.md]
search = **Dev**
replace = **Dev**
Expand Down

0 comments on commit b4d86d9

Please sign in to comment.