.gitea/workflows/build_docker.yaml

@@ -1,130 +0,0 @@
-name: Create Docker Image
-run-name: ${{ gitea.actor }} Building Docker Image 🐳
-on: [push]
-env:
-  VERSION: 8.3-fpm-pgsql-server
-  DOCKER_HOST: tcp://127.0.0.1:2375
-
-jobs:
-  test:
-    strategy:
-      matrix:
-        arch:
-        - x86_64
-        # arm64
-
-    name: Test Application
-    runs-on: docker-${{ matrix.arch }}
-    container:
-      image: gitea.dege.au/docker/php:8.3-fpm-pgsql-server-test
-
-    steps:
-    - name: Code Checkout
-      uses: actions/checkout@v4
-
-    - name: Run Tests
-      run: |
-        mv .env.testing .env
-        # Install Composer and project dependencies.
-        mkdir -p ${COMPOSER_HOME}
-        if [ -n "$GITHUB_TOKEN" ]; then cat $GITHUB_TOKEN |base64 -d > ${COMPOSER_HOME}/auth.json; fi
-        composer install
-        # Generate an application key. Re-cache.
-        php artisan key:generate
-        php artisan migrate
-        php artisan db:seed
-        # run laravel tests
-        touch storage/app/test/*ZIP storage/app/test/file/*
-        XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text --colors=never
-
-  build:
-    strategy:
-      matrix:
-        arch:
-        - x86_64
-        - arm64
-    needs: [test]
-
-    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 }}

.gitlab-ci.yml

@@ -0,0 +1,32 @@
+stages:
+- test
+- build
+- build-manifest
+
+variables:
+  DOCKER_HOST: tcp://docker:2375
+  VERSION: latest
+  VERSIONARCH: ${VERSION}-${ARCH}
+
+# This folder is cached between builds
+# http://docs.gitlab.com/ce/ci/yaml/README.html#cache
+cache:
+  key: ${CI_JOB_NAME_SLUG}-${CI_COMMIT_REF_SLUG}
+  paths:
+  - vendor/
+
+image: docker:latest
+services:
+- docker:dind
+
+before_script:
+- docker info && docker version
+- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
+- if [ -n "$GITHUB_TOKEN" ]; then cat $GITHUB_TOKEN |base64 -d > auth.json; fi
+
+include:
+- .gitlab-test.yml
+- .gitlab-docker-x86_64.yml
+# .gitlab-docker-armv7l.yml
+- .gitlab-docker-arm64.yml
+- .gitlab-docker-manifest.yml

.gitlab-docker-arm64.yml

@@ -0,0 +1,18 @@
+arm64:build:
+  variables:
+    ARCH: arm64
+
+  stage: build
+
+  script:
+  - if [ -f init ]; then chmod 500 init; fi
+  - echo -n ${CI_COMMIT_SHORT_SHA} > VERSION
+  - rm -rf vendor/ database/schema database/seeders/Test*.php database/factories/*
+  - docker build -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH} .
+  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}
+
+  tags:
+  - docker
+  - arm64
+  only:
+  - master

.gitlab-docker-armv7l.yml

@@ -0,0 +1,18 @@
+armv7l:build:
+  variables:
+    ARCH: armv7l
+
+  stage: build
+
+  script:
+  - if [ -f init ]; then chmod 500 init; fi
+  - echo -n ${CI_COMMIT_SHORT_SHA} > VERSION
+  - rm -rf vendor/ database/schema database/seeders/Test*.php database/factories/*
+  - docker build -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH} .
+  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}
+
+  tags:
+  - docker
+  - armv7l
+  only:
+  - master

.gitlab-docker-manifest.yml

@@ -0,0 +1,10 @@
+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}
+  tags:
+  - docker
+  - x86_64
+  only:
+  - master

.gitlab-docker-x86_64.yml

@@ -0,0 +1,18 @@
+x86_64:build:
+  variables:
+    ARCH: x86_64
+
+  stage: build
+
+  script:
+  - if [ -f init ]; then chmod 500 init; fi
+  - echo -n ${CI_COMMIT_SHORT_SHA} > VERSION
+  - rm -rf vendor/ database/schema database/seeders/Test*.php database/factories/*
+  - docker build -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH} .
+  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}
+
+  tags:
+  - docker
+  - x86_64
+  only:
+  - master

.gitlab-test.yml

@@ -0,0 +1,46 @@
+x86_64:test:
+  image: ${CI_REGISTRY}/leenooks/php:8.1-fpm-pgsql-server-test
+
+  stage: test
+
+  # NOTE: This service is dependant on project file configuration, which is not there if the cache was deleted
+  #       resulting in the testing to fail on the first run.
+  services:
+  - name: postgres:15-alpine
+    alias: postgres-test
+
+  variables:
+    POSTGRES_USER: test
+    POSTGRES_PASSWORD: test
+
+  tags:
+  - php
+  - x86_64
+  only:
+  - master
+
+  before_script:
+  - mv .env.testing .env
+
+  # Install Composer and project dependencies.
+  - mkdir -p ${COMPOSER_HOME}
+  - if [ -n "$GITHUB_TOKEN" ]; then cat $GITHUB_TOKEN |base64 -d > ${COMPOSER_HOME}/auth.json; fi
+  - composer install
+
+  # Generate an application key. Re-cache.
+  - php artisan key:generate
+  - php artisan migrate
+  - php artisan db:seed
+
+  script:
+  # run laravel tests
+  - touch storage/app/test/*ZIP storage/app/test/file/*
+  - XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text --colors=never
+
+  coverage: '/^\s*Lines:\s*\d+.\d+\%/'
+
+  # run frontend tests
+  # if you have any task for testing frontend
+  # set it in your package.json script
+  # comment this out if you don't have a frontend test
+  # npm test

resources/views/about.blade.php

@@ -115,7 +115,6 @@
 		<li>jQuery - to help with the web UI</li>
 		<li>Highcharts - to render the graphs</li>
 		<li>AnsiLove - to render the messages, for when they have ANSI code sequences</li>
-		<li><a html="https://www.jetbrains.com/phpstorm/">PhpStorm</a> - the development IDE that makes all this possible and for supporting Open Source projects</li>
 	</ul>
 
 	<p>If you'd like to support enhancing Clearing Houz, <a href="https://buymeacoffee.com/dege">Buy me a coffee!</a></p>