Skip to content

Commit 688b0c4

Browse files
committed
Update layer for newer curl and add part3
1 parent dfebec6 commit 688b0c4

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# static curl build
2-
FROM alpine:3.10 as curlstage
3-
ARG VERSION="7.67.0"
2+
FROM alpine:3.18 as curlstage
3+
ARG VERSION="8.4.0"
44

55
RUN \
66
echo "**** install deps ****" && \
@@ -17,6 +17,7 @@ RUN \
1717
cd curl-* && \
1818
./configure \
1919
--disable-shared \
20+
--with-openssl \
2021
--with-ca-fallback && \
2122
make curl_LDFLAGS=-all-static && \
2223
strip src/curl && \

root/patch

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- casper 2020-04-08 21:24:58.000000000 +0000
2-
+++ casper.new 2020-04-23 17:13:23.139096816 +0000
3-
@@ -47,7 +47,7 @@
1+
--- casper 2020-04-08 21:24:58.000000000 +0000
2+
+++ casper.new 2020-04-23 17:13:23.139096816 +0000
3+
@@ -46,7 +46,7 @@ parse_cmdline() {
44
STATICIP="frommedia"
55
fi
66
export STATICIP ;;
@@ -9,8 +9,8 @@
99
export NETBOOT=url
1010
export URL="${x#url=}" ;;
1111
uuid=*)
12-
@@ -256,22 +256,13 @@
13-
12+
@@ -255,22 +255,16 @@ do_nfsmount() {
13+
1414
do_urlmount() {
1515
rc=1
1616
- modprobe "${MP_QUIET}" isofs
@@ -33,6 +33,9 @@
3333
+ if /bin/curl -L ${URL} -o ${mountpoint}/casper/root.squashfs; then rc=0; fi
3434
+ if [ ! -z "$(/bin/curl -sI "${URL}".part2 | grep "200 OK\|302 Found" || :)" ]; then
3535
+ if /bin/curl -L ${URL}.part2 -o ->> ${mountpoint}/casper/root.squashfs; then rc=0; fi
36+
+ fi
37+
+ if [ ! -z "$(/bin/curl -sI "${URL}".part3 | grep "200 OK\|302 Found" || :)" ]; then
38+
+ if /bin/curl -L ${URL}.part3 -o ->> ${mountpoint}/casper/root.squashfs; then rc=0; fi
3639
fi
3740
-
3841
return ${rc}

0 commit comments

Comments
 (0)