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.

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

Minor fix to migration and Dockerfile #40

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM python:3.6.5-alpine3.7
FROM python:3.9.2-alpine3.13
ENV PYTHONUNBUFFERED 1

RUN apk update && apk upgrade && \
apk add --no-cache \
gcc \
mariadb \
mariadb-dev \
py-mysqldb \
mariadb-connector-c \
musl-dev \
libjpeg-turbo-dev \
zlib-dev
Expand All @@ -18,4 +18,8 @@ RUN mkdir /code
WORKDIR /code
ADD base/requirements.txt /code/requirements.txt
RUN pip install -r requirements.txt
ADD . /code/
ADD . /code/
VOLUME /code/static-files
ENV API_PORT=8000
EXPOSE 8000
ENTRYPOINT ["/startup/prod-entrypoint.sh"]
18 changes: 18 additions & 0 deletions v1/list/migrations/0010_auto_20210402_0743.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 2.1.7 on 2021-04-02 12:43

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('list', '0009_ordered_grocery_item'),
]

operations = [
migrations.AlterField(
model_name='groceryitem',
name='order',
field=models.IntegerField(default=0, verbose_name='order'),
),
]