Bump version to 1.3 (#359)

* Bump version to 1.3 * Docker scan fixes (#361) * docker scan fixes * hadolint fix * anothe hadolint fix * revert installing libprotobuf Co-authored-by: igor-davidyuk <“iprotonv@protonmail.ch”> * Adding Gramine-related manual changes Co-authored-by: Igor Davidyuk <igor.davidyuk@intel.com> Co-authored-by: igor-davidyuk <“iprotonv@protonmail.ch”>
securefederatedai · Mar 18, 2022 · c2e8c0d · c2e8c0d
1 parent 3e33d43
commit c2e8c0d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/openfl-gramine/Dockerfile.gramine b/openfl-gramine/Dockerfile.gramine
@@ -1,6 +1,8 @@
 ARG BASE_IMAGE=python:3.8
 FROM ${BASE_IMAGE}
 
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
 # until these changes are not in pip, install from repo
 RUN git clone https://github.com/intel/openfl.git
 WORKDIR /openfl
@@ -16,7 +18,8 @@ RUN curl -fsSLo /usr/share/keyrings/gramine-keyring.gpg https://packages.gramine
 RUN --mount=type=cache,id=apt-dev,target=/var/cache/apt \
     apt-get update && \
     apt-get install -y --no-install-recommends \
-    gramine libprotobuf-c-dev
+    gramine libprotobuf-c-dev \
+    && rm -rf /var/lib/apt/lists/*
     # there is an issue for libprotobuf-c in gramine repo, install from apt for now
 
 # graminelibos is under this dir

diff --git a/openfl-gramine/Dockerfile.graminized.workspace b/openfl-gramine/Dockerfile.graminized.workspace
@@ -2,7 +2,7 @@ ARG BASE_IMAGE=gramine_openfl
 FROM ${BASE_IMAGE} as builder
 
 ARG WORKSPACE_ARCHIVE
-ADD ${WORKSPACE_ARCHIVE} /workspace.zip
+COPY ${WORKSPACE_ARCHIVE} /workspace.zip
 RUN --mount=type=cache,target=/root/.cache/ \
     fx workspace import --archive /workspace.zip
 

diff --git a/openfl-gramine/MANUAL.md b/openfl-gramine/MANUAL.md
@@ -7,10 +7,9 @@ Building machine:
 - Docker should be installed, user included in Docker group
 
 Machines that will run an Aggregator and Collaborator containers should have the following:
-- SGX enabled in BIOS
-- Ubuntu with Linux kernel 5.11+
-- ? SGX drivers, it is built in kernel: `/dev/sgx_enclave`
-- [aesmd service](https://github.com/intel/linux-sgx) (`/var/run/aesmd/aesm.socket`)
+- FSGSBASE feature and SGX enabled from BIOS
+- Intel SGX driver or Linux 5.11+ driver
+- Intel SGX SDK/PSW
 </br>
 This is a short list, see more in [Gramine docs](https://gramine.readthedocs.io/en/latest/devel/building.html).
 

diff --git a/openfl/__version__.py b/openfl/__version__.py
@@ -1,4 +1,4 @@
 # Copyright (C) 2020-2021 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 """openfl version information."""
-__version__ = '1.2.1'
+__version__ = '1.3'
diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
 
 setup(
     name='openfl',
-    version='1.2.1',
+    version='1.3',
     author='Intel Corporation',
     description='Federated Learning for the Edge',
     long_description=long_description,

diff --git a/tests/github/test_graminize.sh b/tests/github/test_graminize.sh
@@ -1,4 +1,4 @@
-set -e
+set -euxo pipefail
 # Test the pipeline
 # =========== Set SGX_RUN variable to 0 or 1 ============
 
@@ -15,11 +15,6 @@ FQDN=localhost
 COL1_DATA_PATH=1
 COL2_DATA_PATH=2
 
-if [ $REBUILD_IMAGES -gt 0 ]
-then
-REBUILD_OPTION="--rebuild"
-fi
-
 # START
 # =====
 # Make sure you are in a Python virtual environment with the FL package installed.
@@ -34,8 +29,14 @@ FED_DIRECTORY=`pwd`  # Get the absolute directory path for the workspace
 fx plan initialize -a ${FQDN}
 
 openssl genrsa -3 -out ${FED_DIRECTORY}/key.pem 3072
+
 # Build graminized app image
-fx workspace graminize -s ${FED_DIRECTORY}/key.pem --no-save $REBUILD_OPTION
+if [ $REBUILD_IMAGES -gt 0 ]
+then
+fx workspace graminize -s ${FED_DIRECTORY}/key.pem --no-save --rebuild
+else
+fx workspace graminize -s ${FED_DIRECTORY}/key.pem --no-save
+fi
 
 # CERTIFICATION PART------------------------------
 # ================================================