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

make email_alert field available via services API #700

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

make email_alert field available via services API #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
246de54
make is_public field available via services API
jakubgs Oct 21, 2020
8bc5a00
Dockerfile: pin pip at 20.4.5 due to Python 2
jakubgs Sep 15, 2021
4461771
Dockerfile: fix cryptography build by upgrading image
jakubgs Sep 15, 2021
cd14ac6
upgrade social-auth packages to fix GitHub OAuth
jakubgs Sep 15, 2021
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
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:4-alpine
FROM node:12-alpine

ENV PYTHONUNBUFFERED 1

Expand All @@ -22,11 +22,11 @@ RUN apk add --no-cache \

RUN npm config set unsafe-perm true
RUN npm install -g \
--registry http://registry.npmjs.org/ \
coffee-script \
--registry https://registry.npmjs.org/ \
coffeescript \
[email protected]

RUN pip install --upgrade pip
RUN pip install --upgrade pip==20.3.4
Copy link
Contributor

Choose a reason for hiding this comment

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

The related commit messages says "20.4.5" but the code says "20.3.4" 🤔 😃 How about pip<21? Gave me 20.3.4 in practice over here.


COPY requirements.txt ./
RUN pip install --no-cache-dir -r requirements.txt
Expand Down
1 change: 1 addition & 0 deletions cabot/rest_urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ class ViewSet(viewset_class):
'url',
'instances',
'overall_status',
'is_public',
),
))

Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ requests-oauthlib==1.2.0
rjsmin==1.0.12
s3transfer==0.1.13
six==1.10.0
social-auth-app-django==1.1.0
social-auth-core==3.0.0
social-auth-app-django==4.0.0
social-auth-core==3.4.0
twilio==5.7.0
uritemplate==3.0.0
urllib3==1.24.1
Expand Down