From 9502245ed848dba1523b3f87047970509c3825c3 Mon Sep 17 00:00:00 2001 From: Bing Zhang Date: Tue, 25 Jun 2019 11:02:27 -0500 Subject: [PATCH 1/5] remove endDate as required field. add dateCreated and createdBy --- rokwire.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rokwire.yaml b/rokwire.yaml index e4b7edbb..7092e1b3 100755 --- a/rokwire.yaml +++ b/rokwire.yaml @@ -696,7 +696,6 @@ components: required: - title - startDate - - endDate - category type: object properties: @@ -718,6 +717,11 @@ components: - Other subcategory: type: string + dateCreated: + type: string + format: date-time + createdBy: + type: string sponsor: type: string description: For example, Center for Advanced Study From ff5bf30b45fa38a85266f493f9f864cfe4429dbf Mon Sep 17 00:00:00 2001 From: Bing Zhang Date: Wed, 22 Jul 2020 11:06:52 -0500 Subject: [PATCH 2/5] fix docker vulnerability --- CHANGELOG.md | 3 +++ eventservice/Dockerfile | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86f49889..6d0a92e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixed +- Docker image vulnerabilities in Events Building Block. [#484](https://github.com/rokwire/rokwire-building-blocks-api/issues/484) + ### Added - Add Standard License Header for Events Building Block. [#480](https://github.com/rokwire/rokwire-building-blocks-api/issues/480) - Add Standard License Header for Authentication Building Block [#497](https://github.com/rokwire/rokwire-building-blocks-api/issues/497) diff --git a/eventservice/Dockerfile b/eventservice/Dockerfile index 82a6e9b9..6074e027 100644 --- a/eventservice/Dockerfile +++ b/eventservice/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3 +FROM python:3-alpine LABEL maintainer="bing@illinois.edu" @@ -8,7 +8,14 @@ WORKDIR /app COPY eventservice/events.yaml /app/ COPY eventservice /app/eventservice/ COPY lib /lib/ -RUN pip install -r /app/eventservice/requirements.txt + + +RUN apk --update add python3 py3-pip openssl ca-certificates py3-openssl && \ + apk --update add --virtual build-dependencies libffi-dev openssl-dev python3-dev py3-pip build-base && \ + pip install --upgrade pip && \ + pip install -r /app/eventservice/requirements.txt --no-cache-dir && \ + apk del build-dependencies + VOLUME /var/cache/app WORKDIR /app/eventservice/api From 1a4909820c37b8bf6ff9719fa15569a638a62daa Mon Sep 17 00:00:00 2001 From: Bing Zhang Date: Wed, 22 Jul 2020 16:27:54 -0500 Subject: [PATCH 3/5] Update eventservice/Dockerfile Co-authored-by: Sandeep Puthanveetil Satheesan --- eventservice/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eventservice/Dockerfile b/eventservice/Dockerfile index 6074e027..584a9f03 100644 --- a/eventservice/Dockerfile +++ b/eventservice/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-alpine +FROM python:3-alpine3.11 LABEL maintainer="bing@illinois.edu" From 9e229d6529ab20fb49c0bc1a34c977e0ab6cd3a4 Mon Sep 17 00:00:00 2001 From: Sandeep Puthanveetil Satheesan Date: Fri, 24 Jul 2020 12:07:49 -0500 Subject: [PATCH 4/5] Update CHANGELOG.md --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d0a92e1..3f3eb136 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] -### Fixed -- Docker image vulnerabilities in Events Building Block. [#484](https://github.com/rokwire/rokwire-building-blocks-api/issues/484) ### Added - Add Standard License Header for Events Building Block. [#480](https://github.com/rokwire/rokwire-building-blocks-api/issues/480) @@ -26,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Docker image vulnerabilities in Authentication Building Block. [#499](https://github.com/rokwire/rokwire-building-blocks-api/issues/499) +- Docker image vulnerabilities in Events Building Block. [#484](https://github.com/rokwire/rokwire-building-blocks-api/issues/484) ## [1.6.0] - 2020-07-14 - Add Health Building Block APIs documentation. [#468](https://github.com/rokwire/rokwire-building-blocks-api/issues/468) From a7ccca87b9a8c4633e251c464c403b8a6f7c5425 Mon Sep 17 00:00:00 2001 From: Sandeep Puthanveetil Satheesan Date: Fri, 24 Jul 2020 12:08:09 -0500 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f3eb136..042248c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] - ### Added - Add Standard License Header for Events Building Block. [#480](https://github.com/rokwire/rokwire-building-blocks-api/issues/480) - Add Standard License Header for Authentication Building Block [#497](https://github.com/rokwire/rokwire-building-blocks-api/issues/497)