From a26f7f5c9fc59886d61c0ebead665a1e6a59cb84 Mon Sep 17 00:00:00 2001 From: acidumirae Date: Sun, 4 Dec 2022 08:56:23 +0800 Subject: [PATCH] Make PHP 7.4 the default --- wrenchboard/Dockerfile | 16 ++++++++----- wrenchboard/Dockerfile72 | 40 +++++++++++++++++++++++++++++++ wrenchboard/docker-compose-72.yml | 24 +++++++++++++++++++ wrenchboard/docker-compose.yml | 12 +++++----- 4 files changed, 80 insertions(+), 12 deletions(-) create mode 100644 wrenchboard/Dockerfile72 create mode 100644 wrenchboard/docker-compose-72.yml diff --git a/wrenchboard/Dockerfile b/wrenchboard/Dockerfile index 29c5fcc1..a71b6b9c 100644 --- a/wrenchboard/Dockerfile +++ b/wrenchboard/Dockerfile @@ -1,12 +1,13 @@ -FROM registry.chiefsoft.net/php-fpm:7.2 +FROM registry.chiefsoft.net/php-fpm:7.4 RUN apt -y update #RUN apt-cache search gsoap #RUN find / | grep 'php' #RUN apt -y install libjson-c4 -RUN apt -y install libconfig++-dev libconfig++9v5 libconfig-dev libconfig9 libpq-dev libpq5 libjson-c-dev libjson-c3 \ - libpcrecpp0v5 unixodbc-dev postgresql-server-dev-11 libgsoap-dev libgsoap-2.8.75 +#RUN apt-cache search libjson +RUN apt -y install libconfig++-dev libconfig++9v5 libconfig-dev libconfig9 libpq-dev libpq5 libjson-c-dev libjson-c5 \ + libpcrecpp0v5 unixodbc-dev postgresql-server-dev-13 libgsoap-dev libgsoap-2.8.104 RUN apt -y install rapidjson-dev libboost-all-dev @@ -14,7 +15,7 @@ RUN apt -y install rapidjson-dev libboost-all-dev # libpcrecpp0v5 unixodbc-dev postgresql-server-dev-12 libgsoap-dev libgsoap-2.8.91 # DEBUG -RUN apt -y install gdb strace vim postgresql-client-11 +RUN apt -y install gdb strace vim postgresql-client-13 ADD scripts/* /usr/local/bin/ ADD configs/* /cfgs/ @@ -28,13 +29,16 @@ COPY email/ /opt/mainsite/wrenchboard/email ADD etc/* /opt/mainsite/wrenchboard/etc/ COPY src/ /opt/mainsite/wrenchboard/src +RUN cd /opt/mainsite/wrenchboard/src && make clean + RUN cd /opt/mainsite/wrenchboard/build && ./configure RUN cd /opt/mainsite/wrenchboard/src && make -RUN ln -s /opt/mainsite/wrenchboard/src/modules/wrenchboard_api_root.so /usr/local/lib/php/extensions/no-debug-non-zts-20170718/wrenchboard_api_root.so +#RUN ls -l /usr/local/lib/php/extensions/no-debug-non-zts-20190902 +RUN ln -s /opt/mainsite/wrenchboard/src/modules/wrenchboard_api_root.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/wrenchboard_api_root.so RUN touch /opt/mainsite/wrenchboard/logs/wrenchboard_api_root.log -RUN chmod a+w /opt/mainsite/wrenchboard/logs/wrenchboard_api_root.log +RUN chmod a+w /opt/mainsite/wrenchboard/logs/wrenchboard_api_root.log RUN echo "extension=wrenchboard_api_root.so" > /usr/local/etc/php/conf.d/docker-php-ext-wrenchboard.ini diff --git a/wrenchboard/Dockerfile72 b/wrenchboard/Dockerfile72 new file mode 100644 index 00000000..29c5fcc1 --- /dev/null +++ b/wrenchboard/Dockerfile72 @@ -0,0 +1,40 @@ +FROM registry.chiefsoft.net/php-fpm:7.2 + +RUN apt -y update +#RUN apt-cache search gsoap +#RUN find / | grep 'php' +#RUN apt -y install libjson-c4 + +RUN apt -y install libconfig++-dev libconfig++9v5 libconfig-dev libconfig9 libpq-dev libpq5 libjson-c-dev libjson-c3 \ + libpcrecpp0v5 unixodbc-dev postgresql-server-dev-11 libgsoap-dev libgsoap-2.8.75 + +RUN apt -y install rapidjson-dev libboost-all-dev + +# RUN apt -y install libconfig++-dev libconfig++9v5 libconfig-dev libconfig9 libpq-dev libpq5 libjson-c-dev libjson-c4 \ +# libpcrecpp0v5 unixodbc-dev postgresql-server-dev-12 libgsoap-dev libgsoap-2.8.91 + +# DEBUG +RUN apt -y install gdb strace vim postgresql-client-11 + +ADD scripts/* /usr/local/bin/ +ADD configs/* /cfgs/ + +RUN rm -rf /opt/mainsite/wrenchboard +RUN mkdir -p /opt/mainsite/wrenchboard +COPY ../www/ /opt/mainsite/wrenchboard/www +COPY ../www-api/ /opt/mainsite/wrenchboard/www-api +ADD build/* /opt/mainsite/wrenchboard/build/ +COPY email/ /opt/mainsite/wrenchboard/email +ADD etc/* /opt/mainsite/wrenchboard/etc/ +COPY src/ /opt/mainsite/wrenchboard/src + +RUN cd /opt/mainsite/wrenchboard/build && ./configure + +RUN cd /opt/mainsite/wrenchboard/src && make + +RUN ln -s /opt/mainsite/wrenchboard/src/modules/wrenchboard_api_root.so /usr/local/lib/php/extensions/no-debug-non-zts-20170718/wrenchboard_api_root.so + +RUN touch /opt/mainsite/wrenchboard/logs/wrenchboard_api_root.log +RUN chmod a+w /opt/mainsite/wrenchboard/logs/wrenchboard_api_root.log + +RUN echo "extension=wrenchboard_api_root.so" > /usr/local/etc/php/conf.d/docker-php-ext-wrenchboard.ini diff --git a/wrenchboard/docker-compose-72.yml b/wrenchboard/docker-compose-72.yml new file mode 100644 index 00000000..d6de2aad --- /dev/null +++ b/wrenchboard/docker-compose-72.yml @@ -0,0 +1,24 @@ +version: "3" + +services: + wrenchboard-backend-php72: + image: registry.chiefsoft.net/wrenchboard-backend-php72:latest + build: + context: ./ + dockerfile: Dockerfile + hostname: wrenchboard-backend-php72 + container_name: wrenchboard-backend-php72 + ports: + - 9999:9000 + privileged: true + environment: + - DOCKER_BUILDKIT=1 + volumes: + - ./configs:/cfgs + - ../www:/app + - ../www:/opt/mainsite/wrenchboard/www + - ../www-api:/opt/mainsite/wrenchboard/www-api + - ./etc:/opt/mainsite/wrenchboard/etc + - ./email:/opt/mainsite/wrenchboard/email + #- ./src:/opt/mainsite/wrenchboard/src + env_file: .env diff --git a/wrenchboard/docker-compose.yml b/wrenchboard/docker-compose.yml index d6de2aad..b33385de 100644 --- a/wrenchboard/docker-compose.yml +++ b/wrenchboard/docker-compose.yml @@ -1,15 +1,15 @@ version: "3" services: - wrenchboard-backend-php72: - image: registry.chiefsoft.net/wrenchboard-backend-php72:latest + wrenchboard-backend-php74: + image: registry.chiefsoft.net/wrenchboard-backend-php74:latest build: context: ./ - dockerfile: Dockerfile - hostname: wrenchboard-backend-php72 - container_name: wrenchboard-backend-php72 + dockerfile: Dockerfile74 + hostname: wrenchboard-backend-php74 + container_name: wrenchboard-backend-php74 ports: - - 9999:9000 + - 9998:9000 privileged: true environment: - DOCKER_BUILDKIT=1