Skip to content

Commit 7d911ec

Browse files
mikeamikea
committed
[infra] replacing wget with ADD where possible
1 parent 6086188 commit 7d911ec

File tree

3 files changed

+69
-70
lines changed

3 files changed

+69
-70
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.vscode/
22
*.pyc
3-
/build
3+
build/

‎projects/ffmpeg/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
2727
RUN wget ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.1.0.tar.bz2
2828
RUN git clone git://anongit.freedesktop.org/mesa/drm
2929
RUN git clone https://github.com/mstorsjo/fdk-aac.git
30-
RUN wget https://sourceforge.net/projects/lame/files/latest/download -O lame.tar.gz
30+
ADD https://sourceforge.net/projects/lame/files/latest/download lame.tar.gz
3131
RUN git clone git://anongit.freedesktop.org/xorg/lib/libXext
3232
RUN git clone git://anongit.freedesktop.org/git/xorg/lib/libXfixes
3333
RUN git clone git://anongit.freedesktop.org/git/libva

‎projects/libreoffice/Dockerfile

Lines changed: 67 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -18,76 +18,75 @@ FROM ossfuzz/base-libfuzzer
1818
MAINTAINER [email protected]
1919
#build requirements
2020
RUN apt-get -y build-dep libreoffice
21-
RUN apt-get -y install wget
2221
#cache build dependencies
23-
RUN wget http://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz
24-
RUN wget http://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
25-
RUN wget http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
26-
RUN wget http://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
27-
RUN wget http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz
28-
RUN wget http://dev-www.libreoffice.org/src/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz
29-
RUN wget http://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
30-
RUN wget http://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
31-
RUN wget http://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
32-
RUN wget http://dev-www.libreoffice.org/src/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz
33-
RUN wget http://dev-www.libreoffice.org/src/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz
34-
RUN wget http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz
35-
RUN wget http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
36-
RUN wget http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
37-
RUN wget http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
38-
RUN wget http://dev-www.libreoffice.org/src/boost_1_60_0.tar.bz2
39-
RUN wget http://dev-www.libreoffice.org/src/expat-2.2.0.tar.bz2
40-
RUN wget http://dev-www.libreoffice.org/src/jpegsrc.v9a.tar.gz
41-
RUN wget http://dev-www.libreoffice.org/src/lcms2-2.6.tar.gz
42-
RUN wget http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
43-
RUN wget http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
44-
RUN wget http://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz
45-
RUN wget http://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
46-
RUN wget http://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz
47-
RUN wget http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz
48-
RUN wget http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz
49-
RUN wget http://dev-www.libreoffice.org/src/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz
50-
RUN wget http://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
51-
RUN wget http://dev-www.libreoffice.org/src/23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz
52-
RUN wget http://dev-www.libreoffice.org/src/curl-7.51.0.tar.gz
53-
RUN wget http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
54-
RUN wget http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2
55-
RUN wget http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2
56-
RUN wget http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2
57-
RUN wget http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz
58-
RUN wget http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2
59-
RUN wget http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2
60-
RUN wget http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2
61-
RUN wget http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2
62-
RUN wget http://dev-www.libreoffice.org/src/libmwaw-0.3.9.tar.bz2
63-
RUN wget http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2
64-
RUN wget http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz
65-
RUN wget http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2
66-
RUN wget http://dev-www.libreoffice.org/src/libpng-1.6.24.tar.gz
67-
RUN wget http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2
68-
RUN wget http://dev-www.libreoffice.org/src/libstaroffice-0.0.2.tar.bz2
69-
RUN wget http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2
70-
RUN wget http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2
71-
RUN wget http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2
72-
RUN wget http://dev-www.libreoffice.org/src/libwps-0.4.4.tar.bz2
73-
RUN wget http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2
74-
RUN wget http://dev-www.libreoffice.org/src/zlib-1.2.8.tar.gz
75-
RUN wget http://dev-www.libreoffice.org/src/poppler-0.50.0.tar.xz
76-
RUN wget http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2
77-
RUN wget http://dev-www.libreoffice.org/src/openssl-1.0.2h.tar.gz
78-
RUN wget http://dev-www.libreoffice.org/src/language-subtag-registry-2016-07-19.tar.bz2
79-
RUN wget http://dev-www.libreoffice.org/src/3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz
80-
RUN wget http://dev-www.libreoffice.org/src/harfbuzz-1.3.2.tar.bz2
81-
RUN wget http://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
82-
RUN wget http://dev-www.libreoffice.org/src/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz
83-
RUN wget http://dev-www.libreoffice.org/src/ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz
84-
RUN wget http://dev-www.libreoffice.org/src/a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz
85-
RUN wget http://dev-www.libreoffice.org/src/9849a2381bacbeb2714034ad825bede8-hunspell-1.5.4.tar.gz
86-
RUN wget http://dev-www.libreoffice.org/src/dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2
87-
RUN wget http://dev-www.libreoffice.org/src/77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz
88-
RUN wget http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2
22+
ADD http://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz $SRC/
23+
ADD http://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz $SRC/
24+
ADD http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip $SRC/
25+
ADD http://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz $SRC/
26+
ADD http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz $SRC/
27+
ADD http://dev-www.libreoffice.org/src/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz $SRC/
28+
ADD http://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip $SRC/
29+
ADD http://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip $SRC/
30+
ADD http://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz $SRC/
31+
ADD http://dev-www.libreoffice.org/src/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz $SRC/
32+
ADD http://dev-www.libreoffice.org/src/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz $SRC/
33+
ADD http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz $SRC/
34+
ADD http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz $SRC/
35+
ADD http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz $SRC/
36+
ADD http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz $SRC/
37+
ADD http://dev-www.libreoffice.org/src/boost_1_60_0.tar.bz2 $SRC/
38+
ADD http://dev-www.libreoffice.org/src/expat-2.2.0.tar.bz2 $SRC/
39+
ADD http://dev-www.libreoffice.org/src/jpegsrc.v9a.tar.gz $SRC/
40+
ADD http://dev-www.libreoffice.org/src/lcms2-2.6.tar.gz $SRC/
41+
ADD http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz $SRC/
42+
ADD http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 $SRC/
43+
ADD http://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz $SRC/
44+
ADD http://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz $SRC/
45+
ADD http://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz $SRC/
46+
ADD http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz $SRC/
47+
ADD http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz $SRC/
48+
ADD http://dev-www.libreoffice.org/src/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz $SRC/
49+
ADD http://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz $SRC/
50+
ADD http://dev-www.libreoffice.org/src/23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz $SRC/
51+
ADD http://dev-www.libreoffice.org/src/curl-7.51.0.tar.gz $SRC/
52+
ADD http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz $SRC/
53+
ADD http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2 $SRC/
54+
ADD http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2 $SRC/
55+
ADD http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2 $SRC/
56+
ADD http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz $SRC/
57+
ADD http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2 $SRC/
58+
ADD http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2 $SRC/
59+
ADD http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2 $SRC/
60+
ADD http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2 $SRC/
61+
ADD http://dev-www.libreoffice.org/src/libmwaw-0.3.9.tar.bz2 $SRC/
62+
ADD http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2 $SRC/
63+
ADD http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz $SRC/
64+
ADD http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2 $SRC/
65+
ADD http://dev-www.libreoffice.org/src/libpng-1.6.24.tar.gz $SRC/
66+
ADD http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2 $SRC/
67+
ADD http://dev-www.libreoffice.org/src/libstaroffice-0.0.2.tar.bz2 $SRC/
68+
ADD http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2 $SRC/
69+
ADD http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2 $SRC/
70+
ADD http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2 $SRC/
71+
ADD http://dev-www.libreoffice.org/src/libwps-0.4.4.tar.bz2 $SRC/
72+
ADD http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2 $SRC/
73+
ADD http://dev-www.libreoffice.org/src/zlib-1.2.8.tar.gz $SRC/
74+
ADD http://dev-www.libreoffice.org/src/poppler-0.50.0.tar.xz $SRC/
75+
ADD http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2 $SRC/
76+
ADD http://dev-www.libreoffice.org/src/openssl-1.0.2h.tar.gz $SRC/
77+
ADD http://dev-www.libreoffice.org/src/language-subtag-registry-2016-07-19.tar.bz2 $SRC/
78+
ADD http://dev-www.libreoffice.org/src/3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz $SRC/
79+
ADD http://dev-www.libreoffice.org/src/harfbuzz-1.3.2.tar.bz2 $SRC/
80+
ADD http://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip $SRC/
81+
ADD http://dev-www.libreoffice.org/src/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz $SRC/
82+
ADD http://dev-www.libreoffice.org/src/ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz $SRC/
83+
ADD http://dev-www.libreoffice.org/src/a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz $SRC/
84+
ADD http://dev-www.libreoffice.org/src/9849a2381bacbeb2714034ad825bede8-hunspell-1.5.4.tar.gz $SRC/
85+
ADD http://dev-www.libreoffice.org/src/dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2 $SRC/
86+
ADD http://dev-www.libreoffice.org/src/77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz $SRC/
87+
ADD http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2 $SRC/
8988
#fuzzing corpuses
90-
RUN wget http://dev-www.libreoffice.org/corpus/wmffuzzer_seed_corpus.zip
89+
ADD http://dev-www.libreoffice.org/corpus/wmffuzzer_seed_corpus.zip $SRC/
9190
#clone source
9291
RUN git clone --depth 1 git://anongit.freedesktop.org/libreoffice/core libreoffice
9392
WORKDIR libreoffice

0 commit comments

Comments
 (0)