Browse Source

Merge pull request #1273 from doccano/fix/pinning

Update Dockerfiles
pull/1277/head
Hiroki Nakayama 3 years ago
committed by GitHub
parent
commit
19ee4472b7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 15 deletions
  1. 10
      Dockerfile
  2. 12
      app/Dockerfile.dev
  3. 8
      app/Dockerfile.prod

10
Dockerfile

@ -16,11 +16,11 @@ FROM python:${PYTHON_VERSION}-slim-buster AS backend-builder
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
netcat=1.10-41.1 \
libpq-dev=11.11-0+deb10u1 \
unixodbc-dev=2.3.6-0.1 \
g++=4:8.3.0-1 \
libssl-dev=1.1.1d-0+deb10u6 \
netcat=1.* \
libpq-dev=11.* \
unixodbc-dev=2.* \
g++=4:* \
libssl-dev=1.* \
&& apt-get clean && apt-get clean
WORKDIR /tmp WORKDIR /tmp

12
app/Dockerfile.dev

@ -3,12 +3,12 @@ FROM python:${PYTHON_VERSION}-slim-buster
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
wget=1.20.1-1.1 \
netcat=1.10-41.1 \
libpq-dev=11.11-0+deb10u1 \
unixodbc-dev=2.3.6-0.1 \
g++=4:8.3.0-1 \
libssl-dev=1.1.1d-0+deb10u6 \
wget=1.* \
netcat=1.* \
libpq-dev=11.* \
unixodbc-dev=2.* \
g++=4:* \
libssl-dev=1.* \
&& apt-get clean && apt-get clean
ENV ENTRYKIT_VERSION 0.4.0 ENV ENTRYKIT_VERSION 0.4.0

8
app/Dockerfile.prod

@ -14,10 +14,10 @@ COPY ./Pipfile* /app/
# hadolint ignore=DL3013 # hadolint ignore=DL3013
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
netcat=1.10-41.1 \
libpq-dev=11.11-0+deb10u1 \
unixodbc-dev=2.3.6-0.1 \
g++=4:8.3.0-1 \
netcat=1.* \
libpq-dev=11.* \
unixodbc-dev=2.* \
g++=4:* \
&& pip install --no-cache-dir pipenv==2020.11.15 \ && pip install --no-cache-dir pipenv==2020.11.15 \
&& pipenv install --system --deploy \ && pipenv install --system --deploy \
&& pip uninstall -y pipenv virtualenv-clone virtualenv \ && pip uninstall -y pipenv virtualenv-clone virtualenv \

Loading…
Cancel
Save