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.

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

CRW-3487 update to php8.0 #375

Open
wants to merge 2 commits into
base: devspaces-3-rhel-8
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions devspaces-udi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ENV \
HOME=/home/user \
NODEJS_VERSION="16" \
PYTHON_VERSION="3.9" \
PHP_VERSION="7.4" \
PHP_VERSION="8.0" \
XDEBUG_VERSION="3.1.6" \
LD_LIBRARY_PATH="/usr/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" \
CPATH="/usr/include${CPATH:+:${CPATH}}" \
Expand Down Expand Up @@ -259,16 +259,16 @@ RUN \
cd $REMOTE_SOURCES_DIR/xdebug && \
# ls -la . && \
# According to https://xdebug.org/docs/faq#api, must have the same value from php -i | grep "Zend Extension Build" and phpize | grep "Extension Api"
# Zend Extension Build => API320180731,NTS
# Zend Extension Api No: 320180731
# Zend Extension Build => API420200930,NTS
# Zend Extension Api No: 420200930
php -i | grep "Zend Extension Build" && phpize | grep "Extension Api" && \
./configure --enable-xdebug && make && make install && \
# do we need all these settings? or just the zend_extension?
echo -e "zend_extension=$(find /usr/lib64/php/modules -name xdebug.so)\n\
xdebug.client_port = 9000\n\
xdebug.mode = debug\n\
xdebug.start_with_request = yes\n\
xdebug.remote_log=/tmp/xdebug.log" > /etc/php.ini && \
xdebug.log=/tmp/xdebug.log" > /etc/php.ini && \
# set up httpd
sed -i 's/opt\/app-root\/src/projects/' /etc/httpd/conf/httpd.conf && \
sed -i 's/#DocumentRoot/DocumentRoot/' /etc/httpd/conf/httpd.conf && \
Expand Down
8 changes: 4 additions & 4 deletions devspaces-udi/build/php_xdebug.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ FROM ubi8-minimal:latest
USER root
ENV \
HOME=/home/user \
PHP_VERSION="7.4" \
PHP_VERSION="8.0" \
XDEBUG_VERSION="3.1.6"

RUN \
Expand All @@ -35,16 +35,16 @@ RUN \
cd $REMOTE_SOURCES_DIR/xdebug && \
# ls -la . && \
# According to https://xdebug.org/docs/faq#api, must have the same value from php -i | grep "Zend Extension Build" and phpize | grep "Extension Api"
# Zend Extension Build => API320180731,NTS
# Zend Extension Api No: 320180731
# Zend Extension Build => API420200930,NTS
# Zend Extension Api No: 420200930
php -i | grep "Zend Extension Build" && phpize | grep "Extension Api" && \
./configure --enable-xdebug && make && make install && \
# do we need all these settings? or just the zend_extension?
echo -e "zend_extension=$(find /usr/lib64/php/modules -name xdebug.so)\n\
xdebug.client_port = 9000\n\
xdebug.mode = debug\n\
xdebug.start_with_request = yes\n\
xdebug.remote_log=/tmp/xdebug.log" > /etc/php.ini && \
xdebug.log=/tmp/xdebug.log" > /etc/php.ini && \
# set up httpd
sed -i 's/opt\/app-root\/src/projects/' /etc/httpd/conf/httpd.conf && \
sed -i 's/#DocumentRoot/DocumentRoot/' /etc/httpd/conf/httpd.conf && \
Expand Down