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

Jump to bottom

Setting the version to match reality. Sym linking py3 to python for parity #135

Closed
wants to merge 1 commit into from
Closed

Setting the version to match reality. Sym linking py3 to python for parity #135

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
9 changes: 5 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@ MAINTAINER [email protected]
# MySQL-python for performance gains.

# If you add a package here please include a comment above describing what it is used for
RUN apt-get update && apt-get upgrade -qy && apt-get install language-pack-en locales git python3.5 python3-pip libmysqlclient-dev libssl-dev python3-dev -qy && \
RUN apt-get update && apt-get upgrade -qy && apt-get install language-pack-en locales git python3.6 python3-pip libmysqlclient-dev libssl-dev python3.6-dev -qy && \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@coryleeio Do you know if we have tested 3.6 or what is needed to get this PR merged.

pip3 install --upgrade pip setuptools && \
rm -rf /var/lib/apt/lists/*

RUN ln -s /usr/bin/pip3 /usr/bin/pip
RUN ln -s /usr/bin/python3 /usr/bin/python

RUN locale-gen en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
Expand All @@ -40,7 +43,7 @@ WORKDIR /edx/app/notes
COPY requirements/base.txt /edx/app/notes/requirements/base.txt

# Dependencies are installed as root so they cannot be modified by the application user.
RUN pip3 install -r requirements/base.txt
RUN pip install -r requirements/base.txt

RUN mkdir -p /edx/var/log

Expand All @@ -55,8 +58,6 @@ CMD gunicorn --workers=2 --name notes -c /edx/app/notes/notesserver/docker_gunic
# bust the image cache
COPY . /edx/app/notes


FROM app as newrelic
RUN pip install newrelic
CMD newrelic-admin run-program gunicorn --workers=2 --name notes -c /edx/app/notes/notesserver/docker_gunicorn_configuration.py --log-file - --max-requests=1000 notesserver.wsgi:application