diff --git a/linux/ecosystem/php/php8.0/Dockerfile b/linux/ecosystem/php/php8.0/Dockerfile index d41e122e0..e78906746 100644 --- a/linux/ecosystem/php/php8.0/Dockerfile +++ b/linux/ecosystem/php/php8.0/Dockerfile @@ -49,30 +49,30 @@ RUN apt-get update && \ ################################################################## # preparing p4src ################################################################## -RUN wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${P4API_DIR} && \ - wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ - wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${P4PHP_DIR} && \ - wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ - cd ${P4API_DIR} && \ - ls -las && \ - cd ${P4PHP_DIR} && \ - ls -las && \ - cd ${MAKE_DIR} && \ - ls -las && \ - cd ${SRC_DIR} && \ - ls -las +#RUN wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${P4API_DIR} && \ +# wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ +# wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${P4PHP_DIR} && \ +# wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ +# cd ${P4API_DIR} && \ +# ls -las && \ +# cd ${P4PHP_DIR} && \ +# ls -las && \ +# cd ${MAKE_DIR} && \ +# ls -las && \ +# cd ${SRC_DIR} && \ +# ls -las ################################################################## # compilling p4src ################################################################## -RUN cd ${MAKE_DIR} && \ - ls -las && \ - phpize && \ - ./configure --with-perforce=${P4API_DIR} && \ - make && \ - make test && \ - make install && \ - cp ${PHP_MODULE_PATH}/perforce.so ${EXPORT_DIR} +#RUN cd ${MAKE_DIR} && \ +# ls -las && \ +# phpize && \ +# ./configure --with-perforce=${P4API_DIR} && \ +# make && \ +# make test && \ +# make install && \ +# cp ${PHP_MODULE_PATH}/perforce.so ${EXPORT_DIR} ################################################################## # compilling smbclient @@ -222,26 +222,29 @@ RUN apt-get update && \ php -m && \ php -v -################################################################## -# not supported with php8 ################################################################## # Installing IOnCube addon ################################################################# -#ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz -#RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ -# cp /tmp/ioncube/ioncube_loader_lin_7.4.so ${PHP_MODULE_PATH} && \ -## echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/apache2/php.ini && \ -# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/cgi/php.ini && \ -# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/cli/php.ini && \ -# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/fpm/php.ini && \ -# php -m && \ -# php -v +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_8.1.so ${PHP_MODULE_PATH} && \ +## echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.1.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.1.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.1.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.1.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v ################################################################## # Installing P4 addon ################################################################## -COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} -RUN echo "extension = ${PHP_MODULE_PATH}/perforce.so" > ${P4_PHP_INI} && \ +RUN wget --no-check-certificate -c http://ftp.perforce.com/perforce/r20.2/bin.linux26x86_64/perforce_php80.so --random-wait -P ${PHP_MODULE_PATH}/perforce_php80.so && \ + wget --no-check-certificate -c http://ftp.perforce.com/perforce/r20.2/bin.linux26x86_64/perforce_php80-ssl1.0.2.so --random-wait -P ${PHP_MODULE_PATH}/perforce_php80-ssl1.0.2.so && \ + wget --no-check-certificate -c http://ftp.perforce.com/perforce/r20.2/bin.linux26x86_64/perforce_php80-ssl1.1.1.so --random-wait -P ${PHP_MODULE_PATH}/perforce_php80-ssl1.1.1.so + +#COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} + +RUN echo "extension = ${PHP_MODULE_PATH}/perforce_php80-ssl1.1.1.so" > ${P4_PHP_INI} && \ ln -sf ${P4_PHP_INI} ${PHP_DIR}/cgi/conf.d/perforce.ini && \ ln -sf ${P4_PHP_INI} ${PHP_DIR}/cli/conf.d/perforce.ini && \ ln -sf ${P4_PHP_INI} ${PHP_DIR}/fpm/conf.d/perforce.ini && \ diff --git a/linux/ecosystem/php/php8.1-p4-not-ready/Dockerfile b/linux/ecosystem/php/php8.1/Dockerfile similarity index 80% rename from linux/ecosystem/php/php8.1-p4-not-ready/Dockerfile rename to linux/ecosystem/php/php8.1/Dockerfile index 0df911310..cbd7c071b 100644 --- a/linux/ecosystem/php/php8.1-p4-not-ready/Dockerfile +++ b/linux/ecosystem/php/php8.1/Dockerfile @@ -30,7 +30,7 @@ ARG PHP_MODULE_PATH=/usr/lib/php/${PHP_MODULE_VER} RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P4PHP_DIR} ################################################################## -# Installing PHP8 +# Installing PHP8.1 ################################################################## RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \ sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' @@ -49,30 +49,30 @@ RUN apt-get update && \ ################################################################## # preparing p4src ################################################################## -RUN wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${P4API_DIR} && \ - wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ - wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${P4PHP_DIR} && \ - wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ - cd ${P4API_DIR} && \ - ls -las && \ - cd ${P4PHP_DIR} && \ - ls -las && \ - cd ${MAKE_DIR} && \ - ls -las && \ - cd ${SRC_DIR} && \ - ls -las +#RUN wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${P4API_DIR} && \ +# wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ +# wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${P4PHP_DIR} && \ +# wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ +# cd ${P4API_DIR} && \ +# ls -las && \ +# cd ${P4PHP_DIR} && \ +# ls -las && \ +# cd ${MAKE_DIR} && \ +# ls -las && \ +# cd ${SRC_DIR} && \ +# ls -las ################################################################## # compilling p4src ################################################################## -RUN cd ${MAKE_DIR} && \ - ls -las && \ - phpize && \ - ./configure --with-perforce=${P4API_DIR} && \ - make && \ - make test && \ - make install && \ - cp ${PHP_MODULE_PATH}/perforce.so ${EXPORT_DIR} +#RUN cd ${MAKE_DIR} && \ +# ls -las && \ +# phpize && \ +# ./configure --with-perforce=${P4API_DIR} && \ +# make && \ +# make test && \ +# make install && \ +# cp ${PHP_MODULE_PATH}/perforce.so ${EXPORT_DIR} ################################################################## # compilling smbclient @@ -222,26 +222,29 @@ RUN apt-get update && \ php -m && \ php -v -################################################################## -# not supported with php8 ################################################################## # Installing IOnCube addon ################################################################# -#ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz -#RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ -# cp /tmp/ioncube/ioncube_loader_lin_7.4.so ${PHP_MODULE_PATH} && \ -## echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/apache2/php.ini && \ -# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/cgi/php.ini && \ -# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/cli/php.ini && \ -# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/fpm/php.ini && \ -# php -m && \ -# php -v +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_8.1.so ${PHP_MODULE_PATH} && \ +## echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.1.so" >> ${PHP_DIR}/apache2/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.1.so" >> ${PHP_DIR}/cgi/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.1.so" >> ${PHP_DIR}/cli/php.ini && \ + echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.1.so" >> ${PHP_DIR}/fpm/php.ini && \ + php -m && \ + php -v ################################################################## # Installing P4 addon ################################################################## -COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} -RUN echo "extension = ${PHP_MODULE_PATH}/perforce.so" > ${P4_PHP_INI} && \ +RUN wget --no-check-certificate -c http://ftp.perforce.com/perforce/r20.2/bin.linux26x86_64/perforce_php80.so --random-wait -P ${PHP_MODULE_PATH}/perforce_php80.so && \ + wget --no-check-certificate -c http://ftp.perforce.com/perforce/r20.2/bin.linux26x86_64/perforce_php80-ssl1.0.2.so --random-wait -P ${PHP_MODULE_PATH}/perforce_php80-ssl1.0.2.so && \ + wget --no-check-certificate -c http://ftp.perforce.com/perforce/r20.2/bin.linux26x86_64/perforce_php80-ssl1.1.1.so --random-wait -P ${PHP_MODULE_PATH}/perforce_php80-ssl1.1.1.so + +#COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} + +RUN echo "extension = ${PHP_MODULE_PATH}/perforce_php80-ssl1.1.1.so" > ${P4_PHP_INI} && \ ln -sf ${P4_PHP_INI} ${PHP_DIR}/cgi/conf.d/perforce.ini && \ ln -sf ${P4_PHP_INI} ${PHP_DIR}/cli/conf.d/perforce.ini && \ ln -sf ${P4_PHP_INI} ${PHP_DIR}/fpm/conf.d/perforce.ini && \ diff --git a/linux/ecosystem/php/php8.1-p4-not-ready/Makefile b/linux/ecosystem/php/php8.1/Makefile similarity index 100% rename from linux/ecosystem/php/php8.1-p4-not-ready/Makefile rename to linux/ecosystem/php/php8.1/Makefile diff --git a/linux/ecosystem/php/php8.1-p4-not-ready/README.md b/linux/ecosystem/php/php8.1/README.md similarity index 100% rename from linux/ecosystem/php/php8.1-p4-not-ready/README.md rename to linux/ecosystem/php/php8.1/README.md diff --git a/linux/ecosystem/php/php8.1-p4-not-ready/docker-compose.yml b/linux/ecosystem/php/php8.1/docker-compose.yml similarity index 100% rename from linux/ecosystem/php/php8.1-p4-not-ready/docker-compose.yml rename to linux/ecosystem/php/php8.1/docker-compose.yml