Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify docker image #6519

Merged
merged 1 commit into from
Jan 22, 2020
Merged

Simplify docker image #6519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 3 additions & 37 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,3 @@
common
logs
bower_components

.git
*.db*
*.sql
.tox
.cache
.pytest_cache
celerybeat*
debug.log

**/__pycache__

bower_components
contrib
datasets
docs
docker/azurite
docker/search
media/epub
media/htmlzip
media/json
media/pdf
node_modules
private_cname_project
private_cname_root
private_web_root
public_cname_project
public_cname_root
public_cnames
public_symlinks
public_web_root
static
spam-data
user_builds
# We only use the requirements folder in the Dockerfile
*
!requirements/
10 changes: 2 additions & 8 deletions dockerfiles/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8

WORKDIR /usr/src/app

RUN apt-get -y update
RUN apt-get -y install \
curl \
Expand All @@ -32,11 +30,7 @@ RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \

RUN pip3 install --no-cache-dir --upgrade pip

RUN mkdir checkouts
WORKDIR /usr/src/app/checkouts

COPY requirements readthedocs.org/requirements

RUN pip3 install --no-cache-dir -r readthedocs.org/requirements/docker.txt
COPY requirements /tmp/requirements
RUN pip3 install --no-cache-dir -r /tmp/requirements/docker.txt

WORKDIR /usr/src/app/checkouts/readthedocs.org