Added Monogo modules

This reverts commit 106ed1d530.

Downgrade to PHP 7.4 to rebuild ext image

.gitlab-ci.yml

@@ -1,12 +1,13 @@
 image: docker:latest
 
 stages:
+- test
 - build
 - build-test
 
 variables:
-  BRANCH: server
-  VERSION: 8.1-fpm-${BRANCH}
+  BRANCH: ext
+  VERSION: 8.0-fpm-${BRANCH}
   CACHETAG: build-${BRANCH}
   DOCKER_HOST: tcp://docker:2375
 
@@ -18,6 +19,16 @@ before_script:
 - docker version
 - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
 
+test:
+  stage: test
+  script:
+  - cat /etc/hosts
+  - env|sort
+  - docker build -t ${CI_REGISTRY_IMAGE}:${VERSION} .
+  - docker images
+  only:
+  - debug
+
 x86_64:build:
   stage: build
   script:
@@ -30,7 +41,7 @@ x86_64:build:
   - docker
   - x86_64
   only:
-  - server
+  - ext
 
 x86_64:build-test:
   stage: build-test
@@ -43,4 +54,4 @@ x86_64:build-test:
   - docker
   - x86_64
   only:
-  - server
+  - ext

Dockerfile

@@ -1,6 +1,30 @@
 # NAME leenooks/php
-# VERSION 8.1-fpm-server
+# VERSION 8.0-fpm-ext
 
-FROM registry.leenooks.net/leenooks/php:8.1-fpm-latest
+FROM registry.leenooks.net/leenooks/php:8.0-fpm-plus
 
-RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install -j$(nproc) sockets pcntl
+RUN mv /sbin/init /sbin/init.tmp \
+	&& echo "deb http://deb.debian.org/debian buster non-free" >> /etc/apt/sources.list.d/non-free.list && apt-get update \
+	&& apt-get install -y mariadb-client-10.3 inetutils-ping fping pkg-config \
+	libsnmp-dev snmp-mibs-downloader --no-install-recommends \
+	&& download-mibs \
+	&& docker-php-ext-install -j$(nproc) snmp \
+	&& apt purge -yqq systemd-sysv dconf-service \
+	&& apt autoremove -yqq \
+	&& rm -rf /var/lib/apt/lists/* /tmp/* \
+	&& mv /sbin/init.tmp /sbin/init
+
+# Add Mongo DB
+RUN pecl install mongodb && docker-php-ext-enable mongodb \
+	&& rm -rf /tmp/* \
+
+# Add in Leenooks' apt repository
+RUN curl -sL http://apt.leenooks.net/setup.sh | DISTRO=buster bash
+
+RUN mv /sbin/init /sbin/init.tmp \
+	&& apt-get update \
+	&& apt-get install -yqq wkhtmltopdf \
+	&& apt purge -yqq systemd-sysv dconf-service \
+	&& apt autoremove -yqq \
+	&& rm -rf /var/lib/apt/lists/* /tmp/* \
+	&& mv /sbin/init.tmp /sbin/init

Dockerfile.phptest

@@ -1,14 +1,12 @@
 # NAME leenooks/php
-# VERSION 8.1-fpm-server-test
+# VERSION 8.0-fpm-test
 
-FROM registry.leenooks.net/leenooks/php:8.1-fpm-server
+FROM registry.leenooks.net/leenooks/php:8.0-fpm-ext
 
 RUN pecl install xdebug \
 	&& docker-php-ext-enable xdebug
 
-RUN mv /sbin/init /sbin/init.orig \
-	&& apt-get update && apt-get install -y npm \
-	&& apt-get -y autoremove \
-	&& apt-get clean \
-	&& mv /sbin/init.orig /sbin/init \
-	&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN apt-get update && apt-get install -y npm \
+        && apt-get -y autoremove \
+        && apt-get clean \
+        && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*