actions/lint
1
0
Fork 0
mirror of https://github.com/super-linter/super-linter.git synced 2024-11-22 06:01:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix black binary download (#1837)

Browse source 
* Fix black binary download

* Fix wget output option (uppercase `-O`)
* Overwrtie the version of `black` installed by pip as it comes first in
  PATH

* Add glibc-compatible zlib to docker images

This is neded for black and potentially other glibc-compiled binaries to
work properly.

Co-authored-by: Lukas Gravley <admiralawkbar@github.com>
This commit is contained in:
Jameel Al-Aziz 2021-08-09 07:36:32 -07:00 committed by GitHub
parent 11d197c62f
commit c18d840c41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Dockerfile
View file

@ -129,7 +129,12 @@ RUN pip3 install --no-cache-dir pipenv \
&& wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \ && wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
&& chmod +x dotnet-install.sh \ && chmod +x dotnet-install.sh \
&& ./dotnet-install.sh --install-dir /usr/share/dotnet -channel Current -version latest \ && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel Current -version latest \
&& /usr/share/dotnet/dotnet tool install --tool-path /usr/bin dotnet-format --version 5.0.211103 && /usr/share/dotnet/dotnet tool install --tool-path /usr/bin dotnet-format --version 5.0.211103 \
########################
# Install Python Black #
########################
&& wget --tries=5 -q -O /usr/local/bin/black https://github.com/psf/black/releases/download/21.7b0/black_linux \
&& chmod +x /usr/local/bin/black \
############################## ##############################
# Installs Perl dependencies # # Installs Perl dependencies #
############################## ##############################
@ -397,6 +402,11 @@ RUN wget --tries=5 -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sger
php7 php7-phar php7-json php7-mbstring php-xmlwriter \ php7 php7-phar php7-json php7-mbstring php-xmlwriter \
php7-tokenizer php7-ctype php7-curl php7-dom php7-simplexml \ php7-tokenizer php7-ctype php7-curl php7-dom php7-simplexml \
&& rm glibc-${GLIBC_VERSION}.apk \ && rm glibc-${GLIBC_VERSION}.apk \
&& wget -q --tries=5 -O /tmp/libz.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download \
&& mkdir /tmp/libz \
&& tar -xf /tmp/libz.tar.xz -C /tmp/libz \
&& mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib \
&& rm -rf /tmp/libz /tmp/libz.tar.xz \
&& wget -q --tries=5 -O phive.phar https://phar.io/releases/phive.phar \ && wget -q --tries=5 -O phive.phar https://phar.io/releases/phive.phar \
&& wget -q --tries=5 -O phive.phar.asc https://phar.io/releases/phive.phar.asc \ && wget -q --tries=5 -O phive.phar.asc https://phar.io/releases/phive.phar.asc \
&& PHAR_KEY_ID="0x9D8A98B29B2D5D79" \ && PHAR_KEY_ID="0x9D8A98B29B2D5D79" \

10
Dockerfile-slim
View file

@ -105,6 +105,11 @@ RUN pip3 install --no-cache-dir pipenv \
# Installs Perl dependencies # # Installs Perl dependencies #
############################## ##############################
RUN curl --retry 5 --retry-delay 5 -sL https://cpanmin.us/ | perl - -nq --no-wget Perl::Critic \ RUN curl --retry 5 --retry-delay 5 -sL https://cpanmin.us/ | perl - -nq --no-wget Perl::Critic \
########################
# Install Python Black #
########################
&& wget --tries=5 -q -O /usr/local/bin/black https://github.com/psf/black/releases/download/21.7b0/black_linux \
&& chmod +x /usr/local/bin/black \
####################### #######################
# Installs ActionLint # # Installs ActionLint #
####################### #######################
@ -334,6 +339,11 @@ RUN wget --tries=5 -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sger
php7 php7-phar php7-json php7-mbstring php-xmlwriter \ php7 php7-phar php7-json php7-mbstring php-xmlwriter \
php7-tokenizer php7-ctype php7-curl php7-dom php7-simplexml \ php7-tokenizer php7-ctype php7-curl php7-dom php7-simplexml \
&& rm glibc-${GLIBC_VERSION}.apk \ && rm glibc-${GLIBC_VERSION}.apk \
&& wget -q --tries=5 -O /tmp/libz.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download \
&& mkdir /tmp/libz \
&& tar -xf /tmp/libz.tar.xz -C /tmp/libz \
&& mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib \
&& rm -rf /tmp/libz /tmp/libz.tar.xz \
&& wget -q --tries=5 -O phive.phar https://phar.io/releases/phive.phar \ && wget -q --tries=5 -O phive.phar https://phar.io/releases/phive.phar \
&& wget -q --tries=5 -O phive.phar.asc https://phar.io/releases/phive.phar.asc \ && wget -q --tries=5 -O phive.phar.asc https://phar.io/releases/phive.phar.asc \
&& PHAR_KEY_ID="0x9D8A98B29B2D5D79" \ && PHAR_KEY_ID="0x9D8A98B29B2D5D79" \