Skip to content

Commit 54f1867

Browse files
committed
updated depnedabot to only check for security issues, fixed more python dependabot updates, new docker image
1 parent 5e84edb commit 54f1867

File tree

5 files changed

+88
-4
lines changed

5 files changed

+88
-4
lines changed

.github/dependabot.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,18 @@ version: 2
22
updates:
33
- package-ecosystem: "npm"
44
directory: "/vue/docker/vue/package/00"
5+
allowed_updates:
6+
- match:
7+
update_type: "security"
8+
open-pull-requests-limit: 10
59
schedule:
610
interval: "daily"
711

812
- package-ecosystem: "pip"
9-
directory: "/django/docker/django/requirements/00"
13+
directory: "/django/docker/django/requirements/01"
14+
allowed_updates:
15+
- match:
16+
update_type: "security"
17+
open-pull-requests-limit: 10
1018
schedule:
1119
interval: "daily"

django/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
DJANGO_VERSION=3.1.12
2-
DJANGO_VERSION_PREV=3.1.4
1+
DJANGO_VERSION=3.1.12a
2+
DJANGO_VERSION_PREV=3.1.12
33
NOTTY=$(shell command [ "$$DOCKER_NOTTY" = YES ] && echo "-T")
44
DOCKER_EXEC=$(shell command -v docker > /dev/null && echo "docker-compose exec $(NOTTY) django")
55
SHELL := /bin/bash

django/docker/django/Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ RUN apk add --no-cache \
6565
zlib-dev \
6666
&& pip3 cache purge
6767

68+
# python requirements 01 layer, depandabot updates
69+
COPY ./requirements/01/requirements.txt /tmp/requirements.txt
70+
RUN cd /opt && pip3 install -r /tmp/requirements.txt \
71+
&& pip3 cache purge
72+
6873
COPY s6/etc/services.d /etc/services.d
6974
COPY s6/etc/cont-init.d /etc/cont-init.d
7075
ENTRYPOINT ["/init"]
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
aniso8601==7.0.0
2+
appdirs==1.4.4
3+
APScheduler==3.6.3
4+
asgiref==3.4.1
5+
astroid==2.4.2
6+
attrs==20.3.0
7+
beautifulsoup4==4.9.3
8+
blessings==1.7
9+
bpython==0.20.1
10+
certifi==2020.12.5
11+
chardet==4.0.0
12+
click==8.0.1
13+
curtsies==0.3.4
14+
Django==3.1.12
15+
django-apscheduler==0.5.1
16+
django-cors-headers==3.7.0
17+
django-filter==2.4.0
18+
django-json-widget==1.0.1
19+
django-solo==1.1.5
20+
django-sortedm2m==3.0.2
21+
-e git+https://github.com/svleeuwen/sortedm2m-filter-horizontal-widget.git@4ce03f6b7e6022014838afb4a8aa4691fceb9e94#egg=django_sortedm2m_filter_horizontal_widget
22+
djangorestframework==3.12.2
23+
future==0.18.2
24+
graphene==2.1.8
25+
graphene-django==2.14.0
26+
graphql-core==2.3.2
27+
graphql-relay==2.0.1
28+
greenlet==0.4.17
29+
gunicorn==20.1.0
30+
h11==0.11.0
31+
httptools==0.1.1
32+
idna==2.10
33+
iniconfig==1.1.1
34+
isort==5.6.4
35+
jsonslicer==0.1.6
36+
lazy-object-proxy==1.4.3
37+
mccabe==0.6.1
38+
more-itertools==8.6.0
39+
olefile==0.46
40+
ordered-set==4.0.1
41+
packaging==20.9
42+
Pillow==8.2.0
43+
pluggy==0.13.1
44+
promise==2.3
45+
psycopg2==2.8.6
46+
py==1.10.0
47+
Pygments==2.7.4
48+
pylint==2.6.0
49+
pylint-django==2.3.0
50+
pylint-plugin-utils==0.6
51+
pyparsing==2.4.7
52+
pytest==6.2.1
53+
pytest-django==4.1.0
54+
pytz==2020.5
55+
requests==2.25.1
56+
Rx==1.6.1
57+
singledispatch==3.6.2
58+
six==1.15.0
59+
sorl-thumbnail==12.7.0
60+
soupsieve==2.1
61+
sqlparse==0.4.1
62+
text-unidecode==1.3
63+
toml==0.10.2
64+
tzlocal==2.1
65+
urllib3==1.26.5
66+
uvicorn==0.14.0
67+
uvloop==0.14.0
68+
wcwidth==0.2.5
69+
websockets==9.1
70+
wrapt==1.12.1
71+
yapf==0.30.0

docker-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
hostname: vue
1111

1212
django:
13-
image: smartuse/gemeindescan-webui-django:3.1.12
13+
image: smartuse/gemeindescan-webui-django:3.1.12a
1414
hostname: django
1515

1616
www:

0 commit comments

Comments
 (0)