Skip to content

Commit 81fef7a

Browse files
committed
a
1 parent f722930 commit 81fef7a

5 files changed

Lines changed: 367 additions & 303 deletions

File tree

dockerfile

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ RUN <<-EOF
1717
tar -xf xwin.tar.gz
1818
mv xwin-*/xwin /usr/local/bin/
1919
rm -r xwin.tar.gz xwin-*
20-
EOF
21-
22-
RUN apt update && apt install -y --no-install-recommends ca-certificates && apt autoremove -y && apt clean -y
20+
21+
apt update && apt install -y --no-install-recommends ca-certificates && apt autoremove -y && apt clean -y
2322

24-
RUN xwin --accept-license --arch x86 \
25-
--crt-version ${WINDOWS_CRT_VERSION} --sdk-version ${WINDOWS_SDK_VERSION} \
26-
splat --output /opt/xwin --include-debug-libs
23+
xwin --accept-license --arch x86 \
24+
--crt-version ${WINDOWS_CRT_VERSION} --sdk-version ${WINDOWS_SDK_VERSION} \
25+
splat --output /opt/xwin --include-debug-libs
26+
EOF
2727

2828
RUN <<-EOF
2929
set -eux
@@ -110,10 +110,6 @@ RUN <<-EOF
110110
cd /tmp
111111
tar -xf curl.tar.gz
112112
mv curl-* /opt/curl
113-
EOF
114-
115-
RUN <<-EOF
116-
set -eux
117113

118114
cd /opt/curl
119115
sed -ie "s/\\\\xa9/(c)/g" lib/libcurl.rc src/curl.rc # curl/curl#7765

0 commit comments

Comments
 (0)