PHP 8.3 install ldap module

Added gitea CI/CD configuration
2024-04-08 10:17:31 +10:00 · 2024-04-07 20:47:00 +10:00
9 changed files with 201 additions and 206 deletions
--- a/.gitea/workflows/build_docker.yaml
+++ b/.gitea/workflows/build_docker.yaml
@ -0,0 +1,190 @@
+name: Create Docker Image
+run-name: ${{ gitea.actor }} Building Docker Image 🐳
+on: [push]
+env:
+  VERSION: 8.3-fpm-ldap
+  DOCKER_HOST: tcp://127.0.0.1:2375
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        arch:
+        - x86_64
+        - arm64
+
+    name: Build Docker Image
+    runs-on: docker-${{ matrix.arch }}
+    container:
+      image: docker:dind
+      privileged: true
+    env:
+      ARCH: ${{ matrix.arch }}
+      VERSIONARCH: ${{ env.VERSION }}-${{ env.ARCH }}
+
+    steps:
+    - name: Environment Setup
+      run: |
+        # If we have a proxy use it
+        if [ -n "${HTTP_PROXY}" ]; then echo "HTTP PROXY [${HTTP_PROXY}]"; sed -i -e s'/https/http/' /etc/apk/repositories; fi
+        # Some pre-reqs
+        apk add git curl nodejs
+        # Start docker
+        ( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3
+        ## Some debugging info
+        # docker info && docker version
+        # env|sort
+
+    - name: Registry FQDN Setup
+      id: registry
+      run: |
+        registry=${{ github.server_url }}
+        echo "registry=${registry##http*://}" >> "$GITHUB_OUTPUT"
+
+    - name: Container Registry Login
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ steps.registry.outputs.registry }}
+        username: ${{ gitea.actor }}
+        password: ${{ secrets.PKG_WRITE_TOKEN }}
+
+    - name: Code Checkout
+      uses: actions/checkout@v4
+
+    - name: Build and Push Docker Image
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        file: docker/Dockerfile
+        push: true
+        tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}"
+
+  manifest:
+    name: Final Docker Image Manifest
+    runs-on: docker-x86_64
+    container:
+      image: docker:dind
+      privileged: true
+    needs: [build]
+
+    steps:
+    - name: Environment Setup
+      run: |
+        # If we have a proxy use it
+        if [ -n "${HTTP_PROXY}" ]; then echo "HTTP PROXY [${HTTP_PROXY}]"; sed -i -e s'/https/http/' /etc/apk/repositories; fi
+        # Some pre-reqs
+        apk add git curl nodejs
+        # Start docker
+        ( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3
+
+    - name: Registry FQDN Setup
+      id: registry
+      run: |
+        registry=${{ github.server_url }}
+        echo "registry=${registry##http*://}" >> "$GITHUB_OUTPUT"
+
+    - name: Container Registry Login
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ steps.registry.outputs.registry }}
+        username: ${{ gitea.actor }}
+        password: ${{ secrets.PKG_WRITE_TOKEN }}
+
+    - name: Build Docker Manifest
+      run: |
+        docker manifest create ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }} \
+          ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-x86_64 \
+          ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-arm64
+        docker manifest push --purge ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}
+
+  test:
+    strategy:
+      matrix:
+        arch:
+        - x86_64
+        # arm64
+
+    name: Build Docker Test Image
+    runs-on: docker-${{ matrix.arch }}
+    container:
+      image: docker:dind
+      privileged: true
+    env:
+      ARCH: ${{ matrix.arch }}
+      VERSIONARCH: ${{ env.VERSION }}-test-${{ env.ARCH }}
+    needs: [manifest]
+
+    steps:
+    - name: Environment Setup
+      run: |
+        # If we have a proxy use it
+        if [ -n "${HTTP_PROXY}" ]; then echo "HTTP PROXY [${HTTP_PROXY}]"; sed -i -e s'/https/http/' /etc/apk/repositories; fi
+        # Some pre-reqs
+        apk add git curl nodejs
+        # Start docker
+        ( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3
+        ## Some debugging info
+        # docker info && docker version
+        # env|sort
+
+    - name: Registry FQDN Setup
+      id: registry
+      run: |
+        registry=${{ github.server_url }}
+        echo "registry=${registry##http*://}" >> "$GITHUB_OUTPUT"
+
+    - name: Container Registry Login
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ steps.registry.outputs.registry }}
+        username: ${{ gitea.actor }}
+        password: ${{ secrets.PKG_WRITE_TOKEN }}
+
+    - name: Code Checkout
+      uses: actions/checkout@v4
+
+    - name: Build and Push Docker Image
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        file: docker/Dockerfile.phptest
+        push: true
+        tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}"
+
+  manifest-test:
+    name: Final Docker Test Image Manifest
+    runs-on: docker-x86_64
+    container:
+      image: docker:dind
+      privileged: true
+    needs: [test]
+
+    steps:
+    - name: Environment Setup
+      run: |
+        # If we have a proxy use it
+        if [ -n "${HTTP_PROXY}" ]; then echo "HTTP PROXY [${HTTP_PROXY}]"; sed -i -e s'/https/http/' /etc/apk/repositories; fi
+        # Some pre-reqs
+        apk add git curl nodejs
+        # Start docker
+        ( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3
+
+    - name: Registry FQDN Setup
+      id: registry
+      run: |
+        registry=${{ github.server_url }}
+        echo "registry=${registry##http*://}" >> "$GITHUB_OUTPUT"
+
+    - name: Container Registry Login
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ steps.registry.outputs.registry }}
+        username: ${{ gitea.actor }}
+        password: ${{ secrets.PKG_WRITE_TOKEN }}
+
+    - name: Build Docker Manifest
+      run: |
+        docker manifest create ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-test \
+          ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-test-x86_64
+          #${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-test-arm64
+        docker manifest push --purge ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-test
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,35 +0,0 @@
-stages:
- build
- build-manifest
- build-test
- build-manifest-test
-
-variables:
-  BRANCH: master
-  VERSION: 8.3-fpm
-  DOCKER_HOST: tcp://docker:2375
-  VERSIONARCH: ${VERSION}-${ARCH}
-
-cache:
-  key: ${CI_JOB_NAME_SLUG}-${CI_COMMIT_REF_SLUG}
-  paths:
-  - build-cache
-
-image: docker:latest
-services:
- docker:dind
-
-before_script:
- if [ ! -d build-cache ]; then mkdir build-cache; fi
- if [ -n "${HTTP_PROXY}" ]; then echo "HTTP PROXY [${HTTP_PROXY}]"; sed -i -e s'/https/http/' /etc/apk/repositories; fi
- apk add git curl
- docker info && docker version
-# env|sort
-# docker login -u "$CI_DEPENDENCY_PROXY_USER" -p "$CI_DEPENDENCY_PROXY_PASSWORD" "$CI_SERVER_HOST"
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
-
-include:
- .gitlab-docker-x86_64.yml
- .gitlab-docker-armv7l.yml
- .gitlab-docker-arm64.yml
- .gitlab-docker-manifest.yml
--- a/.gitlab-docker-arm64.yml
+++ b/.gitlab-docker-arm64.yml
@ -1,29 +0,0 @@
-arm64:build:
-  variables:
-    ARCH: arm64
-  stage: build
-  script:
-  - if [ -f init ]; then chmod 500 init; fi
-  - ([ -z "$REFRESH" -a -f build-cache/${CI_COMMIT_REF_SLUG} ]) && docker load < build-cache/${CI_COMMIT_REF_SLUG} || true
-  - rm build-cache/* || true
-  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --cache-from ${CI_REGISTRY_IMAGE}:${VERSIONARCH} -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH} .
-  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}
-  - docker save ${CI_REGISTRY_IMAGE}:${VERSIONARCH} > build-cache/${CI_COMMIT_REF_SLUG}
-  tags:
-  - docker
-  - arm64
-  only:
-  - master
-
-#arm64:build-test:
-#  variables:
-#    ARCH: arm64
-#  stage: build-test
-#  script:
-#  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --file Dockerfile.phptest -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test .
-#  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test
-#  tags:
-#  - docker
-#  - arm64
-#  only:
-#  - master
--- a/.gitlab-docker-armv7l.yml
+++ b/.gitlab-docker-armv7l.yml
@ -1,29 +0,0 @@
-armv7l:build:
-  variables:
-    ARCH: armv7l
-  stage: build
-  script:
-  - if [ -f init ]; then chmod 500 init; fi
-  - ([ -z "$REFRESH" -a -f build-cache/${CI_COMMIT_REF_SLUG} ]) && docker load < build-cache/${CI_COMMIT_REF_SLUG} || true
-  - rm build-cache/* || true
-  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --cache-from ${CI_REGISTRY_IMAGE}:${VERSIONARCH} -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH} .
-  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}
-  - docker save ${CI_REGISTRY_IMAGE}:${VERSIONARCH} > build-cache/${CI_COMMIT_REF_SLUG}
-  tags:
-  - docker
-  - armv7l
-  only:
-  - master
-
-#armv7l:build-test:
-#  variables:
-#    ARCH: armv7l
-#  stage: build-test
-#  script:
-#  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --file Dockerfile.phptest -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test .
-#  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test
-#  tags:
-#  - docker
-#  - armv7l
-#  only:
-#  - master
--- a/.gitlab-docker-manifest.yml
+++ b/.gitlab-docker-manifest.yml
@ -1,25 +0,0 @@
-x86_64:build-manifest:
-  stage: build-manifest
-  script:
-  - 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}
-  - 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=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:
-  - docker
-  - x86_64
-  only:
-  - master
-
-x86_64:build-manifest-test:
-  stage: build-manifest-test
-  script:
-  - docker manifest create ${CI_REGISTRY_IMAGE}:${VERSION}-test ${CI_REGISTRY_IMAGE}:${VERSION}-x86_64-test #${CI_REGISTRY_IMAGE}:${VERSION}-arm64-test #${CI_REGISTRY_IMAGE}:${VERSION}-armv7l-test
-  - docker manifest push --purge ${CI_REGISTRY_IMAGE}:${VERSION}-test
-  tags:
-  - docker
-  - x86_64
-  only:
-  - master
--- a/.gitlab-docker-x86_64.yml
+++ b/.gitlab-docker-x86_64.yml
@ -1,29 +0,0 @@
-x86_64:build:
-  variables:
-    ARCH: x86_64
-  stage: build
-  script:
-  - if [ -f init ]; then chmod 500 init; fi
-  - ([ -z "$REFRESH" -a -f build-cache/${CI_COMMIT_REF_SLUG} ]) && docker load < build-cache/${CI_COMMIT_REF_SLUG} || true
-  - rm build-cache/* || true
-  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --cache-from ${CI_REGISTRY_IMAGE}:${VERSIONARCH} -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH} .
-  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}
-  - docker save ${CI_REGISTRY_IMAGE}:${VERSIONARCH} > build-cache/${CI_COMMIT_REF_SLUG}
-  tags:
-  - docker
-  - x86_64
-  only:
-  - master
-
-x86_64:build-test:
-  variables:
-    ARCH: x86_64
-  stage: build-test
-  script:
-  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --file Dockerfile.phptest -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test .
-  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test
-  tags:
-  - docker
-  - x86_64
-  only:
-  - master
--- a/56
+++ b/56
@ -1,56 +0,0 @@
-# NAME leenooks/php
-# VERSION 8.3-fpm-alpine
-
-FROM php:8.3-fpm-alpine
-
-# Change to http respositories, so they we can cache the install packages
-RUN if [ -n ${HTTP_PROXY} ] ; then sed -i -e s'/https/http/' /etc/apk/repositories; fi
-COPY docker/pecl_install /usr/local/bin/pecl_install
-
-# 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" ]
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -0,0 +1,8 @@
+# NAME docker/php
+# VERSION 8.3-fpm-ldap
+
+FROM gitea.dege.au/docker/php:8.3-fpm
+
+RUN apk add --no-cache openldap-clients libldap openldap-dev && \
+	docker-php-ext-install -j$(nproc) ldap && \
+	apk del --no-cache openldap-dev
--- a/docker/Dockerfile.phptest
+++ b/docker/Dockerfile.phptest
@ -1,7 +1,7 @@
-# NAME leenooks/php
-# VERSION 8.3-fpm-test
+# NAME docker/php
+# VERSION 8.3-fpm-ldap-test

-FROM registry.dege.au/leenooks/php:8.3-fpm
+FROM gitea.dege.au/docker/php:8.3-fpm-ldap

 # Add xdebug
 RUN apk --no-cache add linux-headers \
Author	SHA1	Message	Date
Deon George	441cd52f8f	PHP 8.3 install ldap module All checks were successful Create Docker Image / Build Docker Image (x86_64) (push) Successful in 37s Details Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m36s Details Create Docker Image / Final Docker Image Manifest (push) Successful in 10s Details Create Docker Image / Build Docker Test Image (x86_64) (push) Successful in 52s Details Create Docker Image / Final Docker Test Image Manifest (push) Successful in 10s Details	2024-04-08 10:17:31 +10:00
Deon George	0cf1719488	Added gitea CI/CD configuration All checks were successful Create Docker Image / Build Docker Image (x86_64) (push) Successful in 3m0s Details Create Docker Image / Build Docker Image (arm64) (push) Successful in 8m32s Details Create Docker Image / Final Docker Image Manifest (push) Successful in 11s Details Create Docker Image / Build Docker Test Image (x86_64) (push) Successful in 49s Details Create Docker Image / Final Docker Test Image Manifest (push) Successful in 11s Details	2024-04-07 20:47:00 +10:00