Skip to content
This repository was archived by the owner on Oct 23, 2023. It is now read-only.

Commit 000c60c

Browse files
committed
change base to ubuntu & update packages
cyvcf2 could not compile properly on alpine so changing base to slim
1 parent 87a3756 commit 000c60c

3 files changed

Lines changed: 26 additions & 26 deletions

File tree

Dockerfile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
FROM python:3.10.12-alpine3.18 as BUILD
1+
FROM python:3.10.12-slim as BUILD
22

3-
RUN apk add --update \
4-
&& apk add --no-cache build-base curl-dev linux-headers bash git musl-dev\
5-
&& apk add --no-cache openssl-dev libffi-dev autoconf bzip2-dev xz-dev\
6-
&& apk add --no-cache python3-dev rust cargo \
7-
&& rm -rf /var/cache/apk/*
3+
RUN apt-get update \
4+
&& apt-get install -y build-essential bash git gcc \
5+
&& apt-get install -y zlib1g-dev liblzma-dev libcurl4-gnutls-dev libssl-dev libffi-dev autoconf libbz2-dev xz-utils \
6+
&& apt-get install -y python3-dev libdeflate-dev libncurses5-dev libncursesw5-dev libreadline-dev
87

98
COPY requirements.txt /root/beacon/requirements.txt
109

1110
ENV CYTHONIZE=1
11+
# the following related to https://github.com/brentp/cyvcf2/issues/240#issuecomment-1534257675
12+
ENV LIBDEFLATE=1
1213

13-
RUN pip install --upgrade pip && \
14-
pip install Cython==0.29.26 && \
15-
pip install -r /root/beacon/requirements.txt
14+
RUN pip install --upgrade pip \
15+
&& pip install -r /root/beacon/requirements.txt
1616

1717
COPY setup.py /root/beacon/setup.py
1818
COPY beacon_api /root/beacon/beacon_api
1919
RUN pip install /root/beacon
2020

21-
FROM python:3.10.12-alpine3.18
21+
FROM python:3.10.12-slim
2222

23-
RUN apk add --no-cache --update bash
23+
RUN apt-get install -y bash
2424

2525
LABEL maintainer "CSC Developers"
2626
LABEL org.label-schema.schema-version="1.0"
2727
LABEL org.label-schema.vcs-url="https://github.com/CSCFI/beacon-python"
2828

29-
RUN apk add --update \
30-
&& apk add --no-cache curl bzip2 xz
29+
RUN apt-get update \
30+
&& apt-get install -y curl bzip2 xz-utils
3131

3232
COPY --from=BUILD usr/local/lib/python3.10/ usr/local/lib/python3.10/
3333

requirements.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
aiohttp==3.8.4
22
aiohttp-cors==0.7.0
3-
asyncpg==0.27.0
4-
jsonschema==4.17.3
5-
Cython==0.29.35
6-
cyvcf2==0.30.18
3+
asyncpg==0.28.0
4+
jsonschema==4.18.3
5+
Cython==3.0.0
6+
cyvcf2==0.30.22
77
uvloop==0.17.0
88
aiocache==0.11.1
99
ujson==5.8.0
1010
Authlib==1.2.0
11-
gunicorn==20.1.0
11+
gunicorn==21.0.1

setup.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,22 @@
3636
"Programming Language :: Python :: 3.10",
3737
],
3838
install_requires=[
39-
"asyncpg==0.27.0",
39+
"asyncpg==0.28.0",
4040
"aiohttp==3.8.4",
4141
"Authlib==1.2.0",
4242
"aiohttp-cors==0.7.0",
43-
"jsonschema==4.17.3",
44-
"gunicorn==20.1.0",
43+
"jsonschema==4.18.3",
44+
"gunicorn==21.0.1",
4545
"uvloop==0.17.0",
46-
"cyvcf2==0.30.18",
46+
"cyvcf2==0.30.22",
4747
"aiocache==0.11.1",
4848
"ujson==5.8.0",
4949
],
5050
extras_require={
5151
"vcf": [
52-
"numpy==1.25.0",
53-
"cyvcf2==0.30.18",
54-
"Cython==0.29.35",
52+
"numpy==1.25.1",
53+
"cyvcf2==0.30.22",
54+
"Cython==3.0.0",
5555
],
5656
"test": [
5757
"coverage==7.2.7",
@@ -62,7 +62,7 @@
6262
"flake8==6.0.0",
6363
"flake8-docstrings==1.7.0",
6464
"aioresponses==0.7.4",
65-
"black==23.3.0",
65+
"black==23.7.0",
6666
],
6767
"docs": ["sphinx >= 1.4", "sphinx_rtd_theme==1.2.2"],
6868
},

0 commit comments

Comments
 (0)