Update build.sh

Author: Andrea-Scuderi

.gitignore

@@ -1,70 +1,3 @@
-# Xcode
-#
-# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
-
-## Build generated
-build/
-DerivedData/
-
-## Various settings
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata/
-
-## Other
-*.moved-aside
-*.xccheckout
-*.xcscmblueprint
-
-## Obj-C/Swift specific
-*.hmap
-*.ipa
-*.dSYM.zip
-*.dSYM
-
-## Playgrounds
-timeline.xctimeline
-playground.xcworkspace
-
-# Swift Package Manager
-#
-# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
-# Packages/
-# Package.pins
-# Package.resolved
-.build/
-
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# Pods/
-
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build
-
-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
-# screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://docs.fastlane.tools/best-practices/source-control/#source-control
-
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots/**/*.png
-fastlane/test_output
-
+build
+swift-shared-libs
 .serverless

Dockerfile

@@ -1,19 +1,96 @@
-MOUNT_ROOT=$(shell pwd)
-DOCKER_IMAGE=benchmark-node:latest
+#    Copyright 2019 (c) Andrea Scuderi - https://github.com/swift-sprinter
+
+#    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.
+
+# Use this tag to build a customized local image
+
+SWIFT_VERSION?=5.1.4
+LAYER_VERSION?=5-1-4
 
-SWIFT_EXECUTABLE?=GetProduct
-SWIFT_PROJECT_PATH?=./swift-rest-api
-LAMBDA_FUNCTION_NAME?=GetProduct
+DOCKER_TAG=nio-swift:$(SWIFT_VERSION)
+SWIFT_DOCKER_IMAGE=$(DOCKER_TAG)
+SWIFT_LAMBDA_LIBRARY=nio-swift-lambda-runtime-$(LAYER_VERSION)
+SWIFT_CONFIGURATION=release
+
+SERVERLESS_BUILD=build
+SERVERLESS_LAYER=swift-lambda-runtime
+
+# Configuration
+
+# HelloWorld Example Configuration
+SWIFT_EXECUTABLE?=Products
+SWIFT_PROJECT_PATH?=Products
+LAMBDA_FUNCTION_NAME?=Products
 LAMBDA_HANDLER?=$(SWIFT_EXECUTABLE).handler
 
+# Internals
+LAMBDA_ZIP=lambda.zip
+SHARED_LIBS_FOLDER=swift-shared-libs
+LAYER_ZIP=swift-lambda-runtime-$(LAYER_VERSION).zip
+ROOT_BUILD_PATH=./build
+LAYER_BUILD_PATH=$(ROOT_BUILD_PATH)
+LAMBDA_BUILD_PATH=$(ROOT_BUILD_PATH)
+
+# use this for local development
+MOUNT_ROOT=$(shell pwd)
+DOCKER_PROJECT_PATH=$(SWIFT_PROJECT_PATH)
+			
 docker_build:
-	docker build --tag $(DOCKER_IMAGE) .
+	docker build --tag $(DOCKER_TAG) docker/$(SWIFT_VERSION)/.
+
+build_lambda:
+	docker run \
+			--rm \
+			--volume "$(MOUNT_ROOT)/:/src" \
+			--workdir "/src/$(DOCKER_PROJECT_PATH)" \
+			$(SWIFT_DOCKER_IMAGE) \
+			/bin/bash -c "swift build --configuration $(SWIFT_CONFIGURATION)"
 
-docker_bash:
+cp_to_serverless_build: create_build_directory
 	docker run \
-			-it \
 			--rm \
 			--volume "$(MOUNT_ROOT)/:/src" \
+			--workdir "/src/$(DOCKER_PROJECT_PATH)" \
+			$(SWIFT_DOCKER_IMAGE) \
+			/bin/bash -c "swift build -c $(SWIFT_CONFIGURATION) --show-bin-path | tr '\n' '/' > .build/path.txt; echo '$(SWIFT_EXECUTABLE)' >> .build/path.txt |  cat .build/path.txt | xargs cp -t ../$(SERVERLESS_BUILD); rm .build/path.txt"
+
+create_build_directory:
+	if [ ! -d "$(LAMBDA_BUILD_PATH)" ]; then mkdir -p $(LAMBDA_BUILD_PATH); fi
+	if [ ! -d "$(LAYER_BUILD_PATH)" ]; then mkdir -p $(LAYER_BUILD_PATH); fi
+	if [ ! -d "$(SERVERLESS_BUILD)" ]; then mkdir -p $(SERVERLESS_BUILD); fi
+
+package_lambda: create_build_directory build_lambda
+	zip -r -j $(LAMBDA_BUILD_PATH)/$(LAMBDA_ZIP) $(SWIFT_PROJECT_PATH)/.build/$(SWIFT_CONFIGURATION)/$(SWIFT_EXECUTABLE)
+
+package_layer: create_build_directory
+	$(eval SHARED_LIBRARIES := $(shell cat docker/$(SWIFT_VERSION)/swift-shared-libraries.txt | tr '\n' ' '))
+	mkdir -p $(SHARED_LIBS_FOLDER)/lib
+	docker run \
+			--rm \
+			--volume "$(shell pwd)/:/src" \
+			--workdir "/src" \
+			$(SWIFT_DOCKER_IMAGE) \
+			cp /lib64/ld-linux-x86-64.so.2 $(SHARED_LIBS_FOLDER)
+	docker run \
+			--rm \
+			--volume "$(shell pwd)/:/src" \
 			--workdir "/src" \
-			$(DOCKER_IMAGE) \
-			/bin/bash
+			$(SWIFT_DOCKER_IMAGE) \
+			cp -t $(SHARED_LIBS_FOLDER)/lib $(SHARED_LIBRARIES)
+	zip -r $(LAYER_BUILD_PATH)/$(LAYER_ZIP) bootstrap $(SHARED_LIBS_FOLDER)
+
+unzip_package_to_build: create_build_directory
+	if [ ! -d "./$(SERVERLESS_BUILD)/$(SERVERLESS_LAYER)" ]; then mkdir -p ./$(SERVERLESS_BUILD)/$(SERVERLESS_LAYER); fi
+	cp $(LAYER_BUILD_PATH)/$(LAYER_ZIP) ./$(SERVERLESS_BUILD)/$(SERVERLESS_LAYER)/$(LAYER_ZIP)
+	unzip ./$(SERVERLESS_BUILD)/$(SERVERLESS_LAYER)/$(LAYER_ZIP) -d ./$(SERVERLESS_BUILD)/$(SERVERLESS_LAYER)
+	rm ./$(SERVERLESS_BUILD)/$(SERVERLESS_LAYER)/$(LAYER_ZIP)

Makefile

@@ -3,4 +3,3 @@
 /Packages
 /*.xcodeproj
 xcuserdata/
-swift-shared-libs