Merge pull request #115 from metamemelord/3.x-version-bump

Bumped Python version of runtime and CI

Author: metamemelord

.circleci/config.yml

@@ -4,7 +4,7 @@ orbs:
 jobs:
   "test":
     docker:
-      - image: circleci/python:3.8.5
+      - image: circleci/python:3.8
     working_directory: ~/fdk-python
     steps:
       - checkout
@@ -34,7 +34,7 @@ jobs:
             tox -epy3.8
   "deploy":
     docker:
-      - image: circleci/python:3.8.5
+      - image: circleci/python:3.8
     working_directory: ~/fdk-python
     steps:
       - checkout
@@ -55,7 +55,9 @@ jobs:
               git branch --set-upstream-to=origin/${CIRCLE_BRANCH} ${CIRCLE_BRANCH}
 
               ./build-images.sh 3.6
+              ./build-images.sh 3.7
               ./build-images.sh 3.7.1
+              ./build-images.sh 3.8
               ./build-images.sh 3.8.5
               ./release.sh
               ./release_images.sh
@@ -80,6 +82,25 @@ jobs:
           policy_bundle_file_path: .circleci/.anchore/policy_bundle.json
       - anchore/parse_reports
 
+  "python37_security_check":
+    executor: anchore/anchore_engine
+    working_directory: ~/fdk-python
+    steps:
+      - setup_remote_docker:
+          docker_layer_caching: false
+      - checkout
+      - run:
+          name: Python 3.7 build
+          command: |
+            apk add bash
+            ./build-images.sh 3.7
+      - anchore/analyze_local_image:
+          image_name: "fnproject/python:3.7-dev fnproject/python:3.7"
+          timeout: '500'
+          policy_failure: true
+          policy_bundle_file_path: .circleci/.anchore/policy_bundle.json
+      - anchore/parse_reports
+
   "python371_security_check":
     executor: anchore/anchore_engine
     working_directory: ~/fdk-python
@@ -99,6 +120,25 @@ jobs:
           policy_bundle_file_path: .circleci/.anchore/policy_bundle.json
       - anchore/parse_reports
 
+  "python38_security_check":
+    executor: anchore/anchore_engine
+    working_directory: ~/fdk-python
+    steps:
+      - setup_remote_docker:
+          docker_layer_caching: false
+      - checkout
+      - run:
+          name: Python 3.8 build
+          command: |
+            apk add bash
+            ./build-images.sh 3.8
+      - anchore/analyze_local_image:
+          image_name: "fnproject/python:3.8-dev fnproject/python:3.8"
+          timeout: '500'
+          policy_failure: true
+          policy_bundle_file_path: .circleci/.anchore/policy_bundle.json
+      - anchore/parse_reports
+
   "python385_security_check":
     executor: anchore/anchore_engine
     working_directory: ~/fdk-python
@@ -137,5 +177,7 @@ workflows:
                 - master
     jobs:
       - "python36_security_check"
+      - "python37_security_check"
       - "python371_security_check"
+      - "python38_security_check"
       - "python385_security_check"

README.md

@@ -321,12 +321,12 @@ curl -v -X POST localhost:5001 -d '{"name":"denis"}'
 
 First of all create a test function:
 ```bash
-fn init --runtime python3.8.5 test-function
+fn init --runtime python3.8 test-function
 ```
 
 Create a Dockerfile in a function's folder:
 ```dockerfile
-FROM fnproject/python:3.8.5-dev as build-stage
+FROM fnproject/python:3.8-dev as build-stage
 
 ADD . /function
 WORKDIR /function
@@ -335,7 +335,7 @@ RUN pip3 install --target /python/  --no-cache --no-cache-dir fdk-test-py3-none-
 
 RUN rm -fr ~/.cache/pip /tmp* requirements.txt func.yaml Dockerfile .venv
 
-FROM fnproject/python:3.8.5
+FROM fnproject/python:3.8
 
 COPY --from=build-stage /function /function
 COPY --from=build-stage /python /python
@@ -413,7 +413,7 @@ except ValueError as ex:
 ### Dockerfile
 If you've been using CLI to build function without modifying runtime in `func.yaml` to `docker` 
 instead of `python` then the only thing you need is to update the CLI to the latest version and 
-pin your Python runtime version to `python`, `python3.7.1`, or `python3.8.5`.
+pin your Python runtime version to `python`, `python3.7`, or `python3.8`.
 
 If you've been using custom multi-stage Dockerfile (derived from what Fn CLI generates) 
 the only thing that is necessary to change is an `ENTRYPOINT` from:

build-images.sh

@@ -18,7 +18,12 @@
 
 set -xe
 
-pyversion=${1:-"3.8.5"}
+if [ -z "$1" ];then
+  echo "Please supply python version as argument to build image." >> /dev/stderr
+  exit 2
+fi
+
+pyversion=$1
 
 pushd images/build-stage/${pyversion} && docker build -t fnproject/python:${pyversion}-dev . && popd
 pushd images/runtime/${pyversion} && docker build -t fnproject/python:${pyversion} . && popd

images/README.md

@@ -12,11 +12,21 @@ pushd build-stage/3.7.1; docker build -t fnproject/python:3.7.1-dev .; popd
 pushd runtime/3.7.1; docker build -t fnproject/python:3.7.1 .; popd
 ```
 
+```sh
+pushd build-stage/3.7; docker build -t fnproject/python:3.7-dev .; popd
+pushd runtime/3.7; docker build -t fnproject/python:3.7 .; popd
+```
+
 ```sh
 pushd build-stage/3.8.5; docker build -t fnproject/python:3.8.5-dev .; popd
 pushd runtime/3.8.5; docker build -t fnproject/python:3.8.5 .; popd
 ```
 
+```sh
+pushd build-stage/3.8; docker build -t fnproject/python:3.8-dev .; popd
+pushd runtime/3.8; docker build -t fnproject/python:3.8 .; popd
+```
+
 Then push:
 
 ```sh
@@ -29,7 +39,17 @@ docker push fnproject/python:3.7.1-dev
 docker push fnproject/python:3.7.1
 ```
 
+```sh
+docker push fnproject/python:3.7-dev
+docker push fnproject/python:3.7
+```
+
 ```sh
 docker push fnproject/python:3.8.5-dev
 docker push fnproject/python:3.8.5
+```
+
+```sh
+docker push fnproject/python:3.8-dev
+docker push fnproject/python:3.8
 ```

images/build-stage/3.7/Dockerfile

@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM python:3.7-slim
+
+RUN apt-get update && apt-get upgrade -qy && \
+    apt-get install --no-install-recommends -qy build-essential gcc && \
+    apt-get clean

images/build-stage/3.8/Dockerfile

@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM python:3.8-slim
+
+RUN apt-get update && apt-get upgrade -qy && \
+    apt-get install --no-install-recommends -qy build-essential gcc && \
+    apt-get clean

images/runtime/3.7/Dockerfile

@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM python:3.7-slim
+
+
+RUN apt-get update && apt-get upgrade -qy && apt-get clean
+RUN addgroup --system --gid 1000 --system fn && adduser --system --uid 1000 --ingroup fn fn

images/runtime/3.8/Dockerfile

@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM python:3.8-slim
+
+RUN apt-get update && apt-get upgrade -qy && apt-get clean
+RUN addgroup --system --gid 1000 fn && adduser --system --uid 1000 --ingroup fn fn

release_images.sh

@@ -27,6 +27,14 @@ runtime371="3.7.1"
 docker push ${user}/${image}:${runtime371}
 docker push ${user}/${image}:${runtime371}-dev
 
+runtime37="3.7"
+docker push ${user}/${image}:${runtime37}
+docker push ${user}/${image}:${runtime37}-dev
+
 runtime385="3.8.5"
 docker push ${user}/${image}:${runtime385}
 docker push ${user}/${image}:${runtime385}-dev
+
+runtime38="3.8"
+docker push ${user}/${image}:${runtime38}
+docker push ${user}/${image}:${runtime38}-dev

setup.cfg

@@ -4,6 +4,8 @@ summary = Function Developer Kit for Python
 description =
     README.md
 description_content_type = text/markdown; charset=UTF-8; variant=GFM
+license = Apache License 2.0
+license_files = LICENSE, THIRD_PARTY_LICENSES.txt
 author = Denis Makogon
 author-email = denys.makogon@oracle.com
 home-page = https://fnproject.github.io