Skip to content

Commit 4ecc8fe

Browse files
committed
Merge branch 'master' of github.com:RasaHQ/rasa
2 parents 743184d + d59e872 commit 4ecc8fe

17 files changed

+148
-80
lines changed
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Vulnerability Scan
2+
3+
on:
4+
schedule:
5+
# Run once every day
6+
- cron: '0 0 * * *'
7+
8+
jobs:
9+
scan:
10+
name: Vulnerability scan
11+
runs-on: ubuntu-latest
12+
13+
env:
14+
DOCKERFILE: Dockerfile_with_poetry_lock
15+
16+
steps:
17+
- name: Checkout git repository 🕝
18+
uses: actions/checkout@v2
19+
20+
- name: Add poetry.lock 🔒
21+
# Trivy depends on the presence of `poetry.lock` to scan Python dependencies
22+
run: |
23+
BASE_IMAGE=rasa/rasa:latest-full
24+
docker pull $BASE_IMAGE
25+
26+
# Create Dockerfile which includes poetry.lock
27+
tee -a $DOCKERFILE << END
28+
FROM $BASE_IMAGE
29+
COPY poetry.lock .
30+
END
31+
32+
IMAGE_NAME=rasa/rasa:latest-scanned
33+
docker build -f $DOCKERFILE -t $IMAGE_NAME .
34+
35+
echo "::set-env name=IMAGE_WITH_POETRY_LOCK::$IMAGE_NAME"
36+
37+
- name: Scan image 🕵️‍♀️🕵️‍♂️
38+
uses: homoluctus/[email protected]
39+
with:
40+
# Needs the token so it can create an issue once a vulnerability was found
41+
token: ${{ secrets.GITHUB_TOKEN }}
42+
image: ${{ env.IMAGE_WITH_POETRY_LOCK }}
43+
ignore_unfixed: true

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.6-slim as base
1+
FROM python:3.7-slim as base
22

33
RUN apt-get update -qq \
44
&& apt-get install -y --no-install-recommends \
File renamed without changes.

changelog/5627.improvement.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
All Rasa Open Source images are now using Python 3.7 instead of Python 3.6.

changelog/5646.improvement.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
``DIETClassifier`` only counts as extractor in ``rasa test`` if it was actually trained for entity recognition.
2+

changelog/5672.bugfix.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Updated Python dependency ``ruamel.yaml`` to ``>=0.16``. We recommend to use at least
2+
``0.16.10`` due to the security issue
3+
`CVE-2019-20478 <https://nvd.nist.gov/vuln/detail/CVE-2019-20478>`_ which is present in
4+
in prior versions.

docker/Dockerfile_full

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.6-slim as base
1+
FROM python:3.7-slim as base
22

33
RUN apt-get update -qq \
44
&& apt-get install -y --no-install-recommends \

docker/Dockerfile_pretrained_embeddings_mitie_en

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.6-slim as base
1+
FROM python:3.7-slim as base
22

33
RUN apt-get update -qq \
44
&& apt-get install -y --no-install-recommends \

docker/Dockerfile_pretrained_embeddings_spacy_de

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.6-slim as base
1+
FROM python:3.7-slim as base
22

33
RUN apt-get update -qq \
44
&& apt-get install -y --no-install-recommends \

docker/Dockerfile_pretrained_embeddings_spacy_en

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.6-slim as base
1+
FROM python:3.7-slim as base
22

33
RUN apt-get update -qq \
44
&& apt-get install -y --no-install-recommends \

0 commit comments

Comments
 (0)