Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Commit c5e0a09

Browse files
Andrea-ScuderiAndrea-Scuderi
committed
Add support for different SWIFT_VERSION for the command 'make package_layer'
1 parent dcbfedf commit c5e0a09

File tree

3 files changed

+128
-143
lines changed

3 files changed

+128
-143
lines changed

‎Makefile‎

Lines changed: 5 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,17 @@ test_package:
110110
swift test
111111

112112
create_build_directory:
113-
if [ ! -d "$(LAMBDA_BUILD_PATH)" ]; then mkdir $(LAMBDA_BUILD_PATH); fi;
113+
if [ ! -d "$(LAMBDA_BUILD_PATH)" ]; then mkdir $(LAMBDA_BUILD_PATH); fi
114114

115115
package_lambda: clean_lambda create_build_directory build_lambda
116116
zip -r -j $(LAMBDA_BUILD_PATH)/$(LAMBDA_ZIP) $(SWIFT_PROJECT_PATH)/.build/$(SWIFT_CONFIGURATION)/$(SWIFT_EXECUTABLE)
117117

118118
clean_layer:
119-
rm $(LAYER_ZIP) || true
119+
rm $(LAMBDA_BUILD_PATH)/$(LAYER_ZIP) || true
120120
rm -r $(SHARED_LIBS_FOLDER) || true
121121

122-
package_layer_5_0: clean_layer create_build_directory
122+
package_layer: create_build_directory clean_layer
123+
$(eval SHARED_LIBRARIES := $(shell cat docker/$(SWIFT_VERSION)/swift-shared-libraries.txt | tr '\n' ' '))
123124
mkdir -p $(SHARED_LIBS_FOLDER)/lib
124125
docker run \
125126
--rm \
@@ -132,146 +133,7 @@ package_layer_5_0: clean_layer create_build_directory
132133
--volume "$(shell pwd)/:/src" \
133134
--workdir "/src" \
134135
$(SWIFT_DOCKER_IMAGE) \
135-
cp -t $(SHARED_LIBS_FOLDER)/lib \
136-
/lib/x86_64-linux-gnu/libbsd.so.0 \
137-
/lib/x86_64-linux-gnu/libc.so.6 \
138-
/lib/x86_64-linux-gnu/libcom_err.so.2 \
139-
/lib/x86_64-linux-gnu/libcrypt.so.1 \
140-
/lib/x86_64-linux-gnu/libdl.so.2 \
141-
/lib/x86_64-linux-gnu/libgcc_s.so.1 \
142-
/lib/x86_64-linux-gnu/libkeyutils.so.1 \
143-
/lib/x86_64-linux-gnu/liblzma.so.5 \
144-
/lib/x86_64-linux-gnu/libm.so.6 \
145-
/lib/x86_64-linux-gnu/libpthread.so.0 \
146-
/lib/x86_64-linux-gnu/libresolv.so.2 \
147-
/lib/x86_64-linux-gnu/librt.so.1 \
148-
/lib/x86_64-linux-gnu/libutil.so.1 \
149-
/lib/x86_64-linux-gnu/libz.so.1 \
150-
/usr/lib/swift/linux/libBlocksRuntime.so \
151-
/usr/lib/swift/linux/libFoundation.so \
152-
/usr/lib/swift/linux/libdispatch.so \
153-
/usr/lib/swift/linux/libicudataswift.so.61 \
154-
/usr/lib/swift/linux/libicui18nswift.so.61 \
155-
/usr/lib/swift/linux/libicuucswift.so.61 \
156-
/usr/lib/swift/linux/libswiftCore.so \
157-
/usr/lib/swift/linux/libswiftDispatch.so \
158-
/usr/lib/swift/linux/libswiftGlibc.so \
159-
/usr/lib/swift/linux/libswiftSwiftOnoneSupport.so \
160-
/usr/lib/x86_64-linux-gnu/libasn1.so.8 \
161-
/usr/lib/x86_64-linux-gnu/libatomic.so.1 \
162-
/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 \
163-
/usr/lib/x86_64-linux-gnu/libcurl.so.4 \
164-
/usr/lib/x86_64-linux-gnu/libffi.so.6 \
165-
/usr/lib/x86_64-linux-gnu/libgmp.so.10 \
166-
/usr/lib/x86_64-linux-gnu/libgnutls.so.30 \
167-
/usr/lib/x86_64-linux-gnu/libgssapi.so.3 \
168-
/usr/lib/x86_64-linux-gnu/libgssapi_krb5.so.2 \
169-
/usr/lib/x86_64-linux-gnu/libhcrypto.so.4 \
170-
/usr/lib/x86_64-linux-gnu/libheimbase.so.1 \
171-
/usr/lib/x86_64-linux-gnu/libheimntlm.so.0 \
172-
/usr/lib/x86_64-linux-gnu/libhogweed.so.4 \
173-
/usr/lib/x86_64-linux-gnu/libhx509.so.5 \
174-
/usr/lib/x86_64-linux-gnu/libicudata.so.60 \
175-
/usr/lib/x86_64-linux-gnu/libicuuc.so.60 \
176-
/usr/lib/x86_64-linux-gnu/libidn2.so.0 \
177-
/usr/lib/x86_64-linux-gnu/libk5crypto.so.3 \
178-
/usr/lib/x86_64-linux-gnu/libkrb5.so.26 \
179-
/usr/lib/x86_64-linux-gnu/libkrb5.so.3 \
180-
/usr/lib/x86_64-linux-gnu/libkrb5support.so.0 \
181-
/usr/lib/x86_64-linux-gnu/liblber-2.4.so.2 \
182-
/usr/lib/x86_64-linux-gnu/libldap_r-2.4.so.2 \
183-
/usr/lib/x86_64-linux-gnu/libnettle.so.6 \
184-
/usr/lib/x86_64-linux-gnu/libnghttp2.so.14 \
185-
/usr/lib/x86_64-linux-gnu/libp11-kit.so.0 \
186-
/usr/lib/x86_64-linux-gnu/libpsl.so.5 \
187-
/usr/lib/x86_64-linux-gnu/libroken.so.18 \
188-
/usr/lib/x86_64-linux-gnu/librtmp.so.1 \
189-
/usr/lib/x86_64-linux-gnu/libsasl2.so.2 \
190-
/usr/lib/x86_64-linux-gnu/libsqlite3.so.0 \
191-
/usr/lib/x86_64-linux-gnu/libssl.so.1.1 \
192-
/usr/lib/x86_64-linux-gnu/libstdc++.so.6 \
193-
/usr/lib/x86_64-linux-gnu/libtasn1.so.6 \
194-
/usr/lib/x86_64-linux-gnu/libunistring.so.2 \
195-
/usr/lib/x86_64-linux-gnu/libwind.so.0 \
196-
/usr/lib/x86_64-linux-gnu/libxml2.so.2
197-
zip -r $(LAMBDA_BUILD_PATH)/$(LAYER_ZIP) bootstrap $(SHARED_LIBS_FOLDER)
198-
199-
package_layer: clean_layer create_build_directory
200-
mkdir -p $(SHARED_LIBS_FOLDER)/lib
201-
docker run \
202-
--rm \
203-
--volume "$(shell pwd)/:/src" \
204-
--workdir "/src" \
205-
$(SWIFT_DOCKER_IMAGE) \
206-
cp /lib64/ld-linux-x86-64.so.2 $(SHARED_LIBS_FOLDER)
207-
docker run \
208-
--rm \
209-
--volume "$(shell pwd)/:/src" \
210-
--workdir "/src" \
211-
$(SWIFT_DOCKER_IMAGE) \
212-
cp -t $(SHARED_LIBS_FOLDER)/lib \
213-
/lib/x86_64-linux-gnu/libbsd.so.0 \
214-
/lib/x86_64-linux-gnu/libc.so.6 \
215-
/lib/x86_64-linux-gnu/libcom_err.so.2 \
216-
/lib/x86_64-linux-gnu/libcrypt.so.1 \
217-
/lib/x86_64-linux-gnu/libdl.so.2 \
218-
/lib/x86_64-linux-gnu/libgcc_s.so.1 \
219-
/lib/x86_64-linux-gnu/libkeyutils.so.1 \
220-
/lib/x86_64-linux-gnu/liblzma.so.5 \
221-
/lib/x86_64-linux-gnu/libm.so.6 \
222-
/lib/x86_64-linux-gnu/libpthread.so.0 \
223-
/lib/x86_64-linux-gnu/libresolv.so.2 \
224-
/lib/x86_64-linux-gnu/librt.so.1 \
225-
/lib/x86_64-linux-gnu/libutil.so.1 \
226-
/lib/x86_64-linux-gnu/libz.so.1 \
227-
/usr/lib/swift/linux/libBlocksRuntime.so \
228-
/usr/lib/swift/linux/libFoundation.so \
229-
/usr/lib/swift/linux/libdispatch.so \
230-
/usr/lib/swift/linux/libicudataswift.so.61 \
231-
/usr/lib/swift/linux/libicui18nswift.so.61 \
232-
/usr/lib/swift/linux/libicuucswift.so.61 \
233-
/usr/lib/swift/linux/libswiftCore.so \
234-
/usr/lib/swift/linux/libswiftDispatch.so \
235-
/usr/lib/swift/linux/libswiftGlibc.so \
236-
/usr/lib/swift/linux/libswiftSwiftOnoneSupport.so \
237-
/usr/lib/swift/linux/libFoundationNetworking.so \
238-
/usr/lib/x86_64-linux-gnu/libasn1.so.8 \
239-
/usr/lib/x86_64-linux-gnu/libatomic.so.1 \
240-
/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 \
241-
/usr/lib/x86_64-linux-gnu/libcurl.so.4 \
242-
/usr/lib/x86_64-linux-gnu/libffi.so.6 \
243-
/usr/lib/x86_64-linux-gnu/libgmp.so.10 \
244-
/usr/lib/x86_64-linux-gnu/libgnutls.so.30 \
245-
/usr/lib/x86_64-linux-gnu/libgssapi.so.3 \
246-
/usr/lib/x86_64-linux-gnu/libgssapi_krb5.so.2 \
247-
/usr/lib/x86_64-linux-gnu/libhcrypto.so.4 \
248-
/usr/lib/x86_64-linux-gnu/libheimbase.so.1 \
249-
/usr/lib/x86_64-linux-gnu/libheimntlm.so.0 \
250-
/usr/lib/x86_64-linux-gnu/libhogweed.so.4 \
251-
/usr/lib/x86_64-linux-gnu/libhx509.so.5 \
252-
/usr/lib/x86_64-linux-gnu/libicudata.so.60 \
253-
/usr/lib/x86_64-linux-gnu/libicuuc.so.60 \
254-
/usr/lib/x86_64-linux-gnu/libidn2.so.0 \
255-
/usr/lib/x86_64-linux-gnu/libk5crypto.so.3 \
256-
/usr/lib/x86_64-linux-gnu/libkrb5.so.26 \
257-
/usr/lib/x86_64-linux-gnu/libkrb5.so.3 \
258-
/usr/lib/x86_64-linux-gnu/libkrb5support.so.0 \
259-
/usr/lib/x86_64-linux-gnu/liblber-2.4.so.2 \
260-
/usr/lib/x86_64-linux-gnu/libldap_r-2.4.so.2 \
261-
/usr/lib/x86_64-linux-gnu/libnettle.so.6 \
262-
/usr/lib/x86_64-linux-gnu/libnghttp2.so.14 \
263-
/usr/lib/x86_64-linux-gnu/libp11-kit.so.0 \
264-
/usr/lib/x86_64-linux-gnu/libpsl.so.5 \
265-
/usr/lib/x86_64-linux-gnu/libroken.so.18 \
266-
/usr/lib/x86_64-linux-gnu/librtmp.so.1 \
267-
/usr/lib/x86_64-linux-gnu/libsasl2.so.2 \
268-
/usr/lib/x86_64-linux-gnu/libsqlite3.so.0 \
269-
/usr/lib/x86_64-linux-gnu/libssl.so.1.1 \
270-
/usr/lib/x86_64-linux-gnu/libstdc++.so.6 \
271-
/usr/lib/x86_64-linux-gnu/libtasn1.so.6 \
272-
/usr/lib/x86_64-linux-gnu/libunistring.so.2 \
273-
/usr/lib/x86_64-linux-gnu/libwind.so.0 \
274-
/usr/lib/x86_64-linux-gnu/libxml2.so.2
136+
cp -t $(SHARED_LIBS_FOLDER)/lib $(SHARED_LIBRARIES)
275137
zip -r $(LAMBDA_BUILD_PATH)/$(LAYER_ZIP) bootstrap $(SHARED_LIBS_FOLDER)
276138

277139
upload_build_to_s3:

‎docker/5.0.3/swift-shared-libraries.txt‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
/lib/x86_64-linux-gnu/libbsd.so.0
2+
/lib/x86_64-linux-gnu/libc.so.6
3+
/lib/x86_64-linux-gnu/libcom_err.so.2
4+
/lib/x86_64-linux-gnu/libcrypt.so.1
5+
/lib/x86_64-linux-gnu/libdl.so.2
6+
/lib/x86_64-linux-gnu/libgcc_s.so.1
7+
/lib/x86_64-linux-gnu/libkeyutils.so.1
8+
/lib/x86_64-linux-gnu/liblzma.so.5
9+
/lib/x86_64-linux-gnu/libm.so.6
10+
/lib/x86_64-linux-gnu/libpthread.so.0
11+
/lib/x86_64-linux-gnu/libresolv.so.2
12+
/lib/x86_64-linux-gnu/librt.so.1
13+
/lib/x86_64-linux-gnu/libutil.so.1
14+
/lib/x86_64-linux-gnu/libz.so.1
15+
/usr/lib/swift/linux/libBlocksRuntime.so
16+
/usr/lib/swift/linux/libFoundation.so
17+
/usr/lib/swift/linux/libdispatch.so
18+
/usr/lib/swift/linux/libicudataswift.so.61
19+
/usr/lib/swift/linux/libicui18nswift.so.61
20+
/usr/lib/swift/linux/libicuucswift.so.61
21+
/usr/lib/swift/linux/libswiftCore.so
22+
/usr/lib/swift/linux/libswiftDispatch.so
23+
/usr/lib/swift/linux/libswiftGlibc.so
24+
/usr/lib/swift/linux/libswiftSwiftOnoneSupport.so
25+
/usr/lib/x86_64-linux-gnu/libasn1.so.8
26+
/usr/lib/x86_64-linux-gnu/libatomic.so.1
27+
/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1
28+
/usr/lib/x86_64-linux-gnu/libcurl.so.4
29+
/usr/lib/x86_64-linux-gnu/libffi.so.6
30+
/usr/lib/x86_64-linux-gnu/libgmp.so.10
31+
/usr/lib/x86_64-linux-gnu/libgnutls.so.30
32+
/usr/lib/x86_64-linux-gnu/libgssapi.so.3
33+
/usr/lib/x86_64-linux-gnu/libgssapi_krb5.so.2
34+
/usr/lib/x86_64-linux-gnu/libhcrypto.so.4
35+
/usr/lib/x86_64-linux-gnu/libheimbase.so.1
36+
/usr/lib/x86_64-linux-gnu/libheimntlm.so.0
37+
/usr/lib/x86_64-linux-gnu/libhogweed.so.4
38+
/usr/lib/x86_64-linux-gnu/libhx509.so.5
39+
/usr/lib/x86_64-linux-gnu/libicudata.so.60
40+
/usr/lib/x86_64-linux-gnu/libicuuc.so.60
41+
/usr/lib/x86_64-linux-gnu/libidn2.so.0
42+
/usr/lib/x86_64-linux-gnu/libk5crypto.so.3
43+
/usr/lib/x86_64-linux-gnu/libkrb5.so.26
44+
/usr/lib/x86_64-linux-gnu/libkrb5.so.3
45+
/usr/lib/x86_64-linux-gnu/libkrb5support.so.0
46+
/usr/lib/x86_64-linux-gnu/liblber-2.4.so.2
47+
/usr/lib/x86_64-linux-gnu/libldap_r-2.4.so.2
48+
/usr/lib/x86_64-linux-gnu/libnettle.so.6
49+
/usr/lib/x86_64-linux-gnu/libnghttp2.so.14
50+
/usr/lib/x86_64-linux-gnu/libp11-kit.so.0
51+
/usr/lib/x86_64-linux-gnu/libpsl.so.5
52+
/usr/lib/x86_64-linux-gnu/libroken.so.18
53+
/usr/lib/x86_64-linux-gnu/librtmp.so.1
54+
/usr/lib/x86_64-linux-gnu/libsasl2.so.2
55+
/usr/lib/x86_64-linux-gnu/libsqlite3.so.0
56+
/usr/lib/x86_64-linux-gnu/libssl.so.1.1
57+
/usr/lib/x86_64-linux-gnu/libstdc++.so.6
58+
/usr/lib/x86_64-linux-gnu/libtasn1.so.6
59+
/usr/lib/x86_64-linux-gnu/libunistring.so.2
60+
/usr/lib/x86_64-linux-gnu/libwind.so.0
61+
/usr/lib/x86_64-linux-gnu/libxml2.so.2

‎docker/5.1/swift-shared-libraries.txt‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
/lib/x86_64-linux-gnu/libbsd.so.0
2+
/lib/x86_64-linux-gnu/libc.so.6
3+
/lib/x86_64-linux-gnu/libcom_err.so.2
4+
/lib/x86_64-linux-gnu/libcrypt.so.1
5+
/lib/x86_64-linux-gnu/libdl.so.2
6+
/lib/x86_64-linux-gnu/libgcc_s.so.1
7+
/lib/x86_64-linux-gnu/libkeyutils.so.1
8+
/lib/x86_64-linux-gnu/liblzma.so.5
9+
/lib/x86_64-linux-gnu/libm.so.6
10+
/lib/x86_64-linux-gnu/libpthread.so.0
11+
/lib/x86_64-linux-gnu/libresolv.so.2
12+
/lib/x86_64-linux-gnu/librt.so.1
13+
/lib/x86_64-linux-gnu/libutil.so.1
14+
/lib/x86_64-linux-gnu/libz.so.1
15+
/usr/lib/swift/linux/libBlocksRuntime.so
16+
/usr/lib/swift/linux/libFoundation.so
17+
/usr/lib/swift/linux/libFoundationNetworking.so
18+
/usr/lib/swift/linux/libdispatch.so
19+
/usr/lib/swift/linux/libicudataswift.so.61
20+
/usr/lib/swift/linux/libicui18nswift.so.61
21+
/usr/lib/swift/linux/libicuucswift.so.61
22+
/usr/lib/swift/linux/libswiftCore.so
23+
/usr/lib/swift/linux/libswiftDispatch.so
24+
/usr/lib/swift/linux/libswiftGlibc.so
25+
/usr/lib/swift/linux/libswiftSwiftOnoneSupport.so
26+
/usr/lib/x86_64-linux-gnu/libasn1.so.8
27+
/usr/lib/x86_64-linux-gnu/libatomic.so.1
28+
/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1
29+
/usr/lib/x86_64-linux-gnu/libcurl.so.4
30+
/usr/lib/x86_64-linux-gnu/libffi.so.6
31+
/usr/lib/x86_64-linux-gnu/libgmp.so.10
32+
/usr/lib/x86_64-linux-gnu/libgnutls.so.30
33+
/usr/lib/x86_64-linux-gnu/libgssapi.so.3
34+
/usr/lib/x86_64-linux-gnu/libgssapi_krb5.so.2
35+
/usr/lib/x86_64-linux-gnu/libhcrypto.so.4
36+
/usr/lib/x86_64-linux-gnu/libheimbase.so.1
37+
/usr/lib/x86_64-linux-gnu/libheimntlm.so.0
38+
/usr/lib/x86_64-linux-gnu/libhogweed.so.4
39+
/usr/lib/x86_64-linux-gnu/libhx509.so.5
40+
/usr/lib/x86_64-linux-gnu/libicudata.so.60
41+
/usr/lib/x86_64-linux-gnu/libicuuc.so.60
42+
/usr/lib/x86_64-linux-gnu/libidn2.so.0
43+
/usr/lib/x86_64-linux-gnu/libk5crypto.so.3
44+
/usr/lib/x86_64-linux-gnu/libkrb5.so.26
45+
/usr/lib/x86_64-linux-gnu/libkrb5.so.3
46+
/usr/lib/x86_64-linux-gnu/libkrb5support.so.0
47+
/usr/lib/x86_64-linux-gnu/liblber-2.4.so.2
48+
/usr/lib/x86_64-linux-gnu/libldap_r-2.4.so.2
49+
/usr/lib/x86_64-linux-gnu/libnettle.so.6
50+
/usr/lib/x86_64-linux-gnu/libnghttp2.so.14
51+
/usr/lib/x86_64-linux-gnu/libp11-kit.so.0
52+
/usr/lib/x86_64-linux-gnu/libpsl.so.5
53+
/usr/lib/x86_64-linux-gnu/libroken.so.18
54+
/usr/lib/x86_64-linux-gnu/librtmp.so.1
55+
/usr/lib/x86_64-linux-gnu/libsasl2.so.2
56+
/usr/lib/x86_64-linux-gnu/libsqlite3.so.0
57+
/usr/lib/x86_64-linux-gnu/libssl.so.1.1
58+
/usr/lib/x86_64-linux-gnu/libstdc++.so.6
59+
/usr/lib/x86_64-linux-gnu/libtasn1.so.6
60+
/usr/lib/x86_64-linux-gnu/libunistring.so.2
61+
/usr/lib/x86_64-linux-gnu/libwind.so.0
62+
/usr/lib/x86_64-linux-gnu/libxml2.so.2

0 commit comments

Comments
 (0)