Compare commits

...

1 Commits

Author SHA1 Message Date
Deon George
4da7c44335 PHP 8.3 install postgres module 2024-01-22 17:54:05 +11:00
7 changed files with 18 additions and 68 deletions

View File

@ -5,8 +5,8 @@ stages:
- build-manifest-test - build-manifest-test
variables: variables:
BRANCH: master BRANCH: pgsql
VERSION: 8.3-fpm VERSION: 8.3-fpm-${BRANCH}
DOCKER_HOST: tcp://docker:2375 DOCKER_HOST: tcp://docker:2375
VERSIONARCH: ${VERSION}-${ARCH} VERSIONARCH: ${VERSION}-${ARCH}

View File

@ -13,7 +13,7 @@ arm64:build:
- docker - docker
- arm64 - arm64
only: only:
- master - pgsql
#arm64:build-test: #arm64:build-test:
# variables: # variables:
@ -26,4 +26,4 @@ arm64:build:
# - docker # - docker
# - arm64 # - arm64
# only: # only:
# - master # - pgsql

View File

@ -13,7 +13,7 @@ armv7l:build:
- docker - docker
- armv7l - armv7l
only: only:
- master - pgsql
#armv7l:build-test: #armv7l:build-test:
# variables: # variables:
@ -26,4 +26,4 @@ armv7l:build:
# - docker # - docker
# - armv7l # - armv7l
# only: # only:
# - master # - pgsql

View File

@ -4,14 +4,12 @@ x86_64:build-manifest:
- docker manifest create ${CI_REGISTRY_IMAGE}:${VERSION} ${CI_REGISTRY_IMAGE}:${VERSION}-x86_64 ${CI_REGISTRY_IMAGE}:${VERSION}-arm64 ${CI_REGISTRY_IMAGE}:${VERSION}-armv7l - docker manifest create ${CI_REGISTRY_IMAGE}:${VERSION} ${CI_REGISTRY_IMAGE}:${VERSION}-x86_64 ${CI_REGISTRY_IMAGE}:${VERSION}-arm64 ${CI_REGISTRY_IMAGE}:${VERSION}-armv7l
- docker manifest push --purge ${CI_REGISTRY_IMAGE}:${VERSION} - docker manifest push --purge ${CI_REGISTRY_IMAGE}:${VERSION}
- apk add --no-cache curl - apk add --no-cache curl
- if [ -n "${AUTO_BUILD}" ]; then curl -LX POST --post301 -F token=${TRIGGER_TOKEN} -F ref=pgsql ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/trigger/pipeline; fi - if [ -n "${AUTO_BUILD}" ]; then curl -LX POST --post301 -F token=${TRIGGER_TOKEN} -F ref=pgsql-server ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/trigger/pipeline; fi
- if [ -n "${AUTO_BUILD}" ]; then curl -LX POST --post301 -F token=${TRIGGER_TOKEN} -F ref=mysql ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/trigger/pipeline; fi
- if [ -n "${AUTO_BUILD}" ]; then curl -LX POST --post301 -F token=${TRIGGER_TOKEN} -F ref=ldap ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/trigger/pipeline; fi
tags: tags:
- docker - docker
- x86_64 - x86_64
only: only:
- master - pgsql
x86_64:build-manifest-test: x86_64:build-manifest-test:
stage: build-manifest-test stage: build-manifest-test
@ -22,4 +20,4 @@ x86_64:build-manifest-test:
- docker - docker
- x86_64 - x86_64
only: only:
- master - pgsql

View File

@ -13,7 +13,7 @@ x86_64:build:
- docker - docker
- x86_64 - x86_64
only: only:
- master - pgsql
x86_64:build-test: x86_64:build-test:
variables: variables:
@ -26,4 +26,4 @@ x86_64:build-test:
- docker - docker
- x86_64 - x86_64
only: only:
- master - pgsql

View File

@ -1,56 +1,8 @@
# NAME leenooks/php # NAME leenooks/php
# VERSION 8.3-fpm-alpine # VERSION 8.3-fpm-pgsql
FROM php:8.3-fpm-alpine FROM registry.dege.au/leenooks/php:8.3-fpm
# Change to http respositories, so they we can cache the install packages RUN apk add --no-cache postgresql-client libpq libpq-dev && \
RUN if [ -n ${HTTP_PROXY} ] ; then sed -i -e s'/https/http/' /etc/apk/repositories; fi docker-php-ext-install -j$(nproc) pdo_pgsql && \
COPY docker/pecl_install /usr/local/bin/pecl_install apk del --no-cache libpq-dev
# Tune PHP
RUN sed -e 's/^expose_php = On/expose_php = Off/' /usr/local/etc/php/php.ini-production > /usr/local/etc/php/php.ini
RUN sed -i -e 's#^;sendmail_path =#sendmail_path = "/usr/bin/msmtp -t"#' /usr/local/etc/php/php.ini
RUN sed -i -e 's#^memory_limit = 128M#memory_limit = 256M#' /usr/local/etc/php/php.ini
RUN adduser -g "Hosting Admin User" -u 1000 -G www-data -h /var/www/html -HD lamp
# Base
RUN apk add --no-cache bash unzip zlib nginx msmtp
RUN curl -SLo /usr/local/bin/wait-for-it https://github.com/vishnubob/wait-for-it/raw/master/wait-for-it.sh && chmod +x /usr/local/bin/wait-for-it
# Memcache
RUN apk add --no-cache memcached libmemcached pkgconfig zlib-dev memcached-dev libmemcached-dev && \
pecl_install igbinary msgpack memcached && \
mkdir /run/memcached && chown memcached:memcached /run/memcached && \
apk del --no-cache pkgconfig zlib-dev memcached-dev libmemcached-dev
# Enable ZIP BZIP2
RUN apk add --no-cache libzip libzip-dev zlib-dev && \
docker-php-ext-install -j$(nproc) zip bz2 && \
apk del --no-cache libzip-dev zlib-dev
# Add zstd
RUN pecl_install zstd
# Add GD
RUN apk add --no-cache libjpeg libgd libpng freetype freetype-dev zlib-dev libpng-dev jpeg-dev && \
docker-php-ext-configure gd --with-freetype=/usr/include/freetype2 --with-jpeg=/usr/include/ && \
docker-php-ext-install -j$(nproc) gd && \
apk del --no-cache zlib-dev libpng-dev jpeg-dev freetype-dev
# Add composer
RUN curl -4 https://getcomposer.org/installer|php -- --install-dir=/usr/local/bin --filename=composer
ENV COMPOSER_HOME=/var/cache/composer
# Other config
COPY msmtprc /etc/
COPY docker/www.conf /usr/local/etc/php-fpm.d/
COPY docker/nginx-app.conf /etc/nginx/http.d/default.conf
COPY docker/init /sbin/
RUN chmod 550 /sbin/init && chown 0:0 /sbin/init
VOLUME [ "/var/cache/composer" ]
WORKDIR /var/www/html
EXPOSE 80
ENTRYPOINT [ "/sbin/init" ]
CMD [ "php-fpm" ]

View File

@ -1,7 +1,7 @@
# NAME leenooks/php # NAME leenooks/php
# VERSION 8.3-fpm-test # VERSION 8.3-fpm-pgsql-test
FROM registry.dege.au/leenooks/php:8.3-fpm FROM registry.dege.au/leenooks/php:8.3-fpm-pgsql
# Add xdebug # Add xdebug
RUN apk --no-cache add linux-headers \ RUN apk --no-cache add linux-headers \