Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PHP version switch #1083

Merged
merged 2 commits into from
Dec 7, 2021
Merged

PHP version switch #1083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c3f19d
fixe issue #1060
llaville Dec 7, 2021
a0abe31
fix hadolint error DL3059
llaville Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ RUN apk add --update --no-cache \
php8-dom \
php8-simplexml \
composer \
dpkg \
ruby \
ruby-dev \
ruby-bundler \
Expand Down Expand Up @@ -266,7 +267,9 @@ RUN wget --tries=5 -q -O phive.phar https://phar.io/releases/phive.phar \
&& gpg --verify phive.phar.asc phive.phar \
&& chmod +x phive.phar \
&& mv phive.phar /usr/local/bin/phive \
&& rm phive.phar.asc
&& rm phive.phar.asc \
&& update-alternatives --install /usr/bin/php php /usr/bin/php7 100 \
&& update-alternatives --install /usr/bin/php php /usr/bin/php8 10


# POWERSHELL installation
Expand Down
5 changes: 4 additions & 1 deletion flavors/php/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ RUN apk add --update --no-cache \
php8-dom \
php8-simplexml \
composer \
dpkg \
ansible \
ansible-lint \
libc-dev \
Expand Down Expand Up @@ -184,7 +185,9 @@ RUN wget --tries=5 -q -O phive.phar https://phar.io/releases/phive.phar \
&& gpg --verify phive.phar.asc phive.phar \
&& chmod +x phive.phar \
&& mv phive.phar /usr/local/bin/phive \
&& rm phive.phar.asc
&& rm phive.phar.asc \
&& update-alternatives --install /usr/bin/php php /usr/bin/php7 100 \
&& update-alternatives --install /usr/bin/php php /usr/bin/php8 10


# actionlint installation
Expand Down
5 changes: 4 additions & 1 deletion megalinter/descriptors/php.megalinter-descriptor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ install:
- php8-dom
- php8-simplexml
- composer
- dpkg
dockerfile:
- |
RUN wget --tries=5 -q -O phive.phar https://phar.io/releases/phive.phar \
Expand All @@ -38,7 +39,9 @@ install:
&& gpg --verify phive.phar.asc phive.phar \
&& chmod +x phive.phar \
&& mv phive.phar /usr/local/bin/phive \
&& rm phive.phar.asc
&& rm phive.phar.asc \
&& update-alternatives --install /usr/bin/php php /usr/bin/php7 100 \
&& update-alternatives --install /usr/bin/php php /usr/bin/php8 10
linters:
# PHP Built in Linter
- linter_name: php
Expand Down