From 508c8ceaafc33efa1b979547cbe42a4d6cc49499 Mon Sep 17 00:00:00 2001 From: Deon George Date: Wed, 3 Jul 2024 12:25:34 +1000 Subject: [PATCH] Updated for gitea --- .gitea/workflows/build_docker.yaml | 147 +++++++++++++++++++++++++++++ .gitlab-ci.yml | 14 --- .gitlab-docker-x86_64.yml | 27 ------ .gitlab-test.yml | 48 ---------- Dockerfile => docker/Dockerfile | 4 +- 5 files changed, 150 insertions(+), 90 deletions(-) create mode 100644 .gitea/workflows/build_docker.yaml delete mode 100644 .gitlab-ci.yml delete mode 100644 .gitlab-docker-x86_64.yml delete mode 100644 .gitlab-test.yml rename Dockerfile => docker/Dockerfile (77%) diff --git a/.gitea/workflows/build_docker.yaml b/.gitea/workflows/build_docker.yaml new file mode 100644 index 0000000..9e99b91 --- /dev/null +++ b/.gitea/workflows/build_docker.yaml @@ -0,0 +1,147 @@ +name: Create Docker Image +run-name: ${{ gitea.actor }} Building Docker Image 🐳 +on: [push] +env: + VERSION: latest + 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: 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 nodejs +# ## Some debugging info +# # env|sort +# +# - 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 "${{ secrets.COMPOSER_GITHUB_TOKEN }}" ]; then echo ${{ secrets.COMPOSER_GITHUB_TOKEN }} > ${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 + echo "PRT: ${{ secrets.PKG_WRITE_TOKEN }}" + + - 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: Record version + run: | + pwd + ls -al + echo ${GITHUB_SHA::8} > VERSION + cat VERSION + + - 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 }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 34d272e..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,14 +0,0 @@ -stages: -- test -- build - -# 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/ - -include: -- .gitlab-test.yml -- .gitlab-docker-x86_64.yml diff --git a/.gitlab-docker-x86_64.yml b/.gitlab-docker-x86_64.yml deleted file mode 100644 index c33b8db..0000000 --- a/.gitlab-docker-x86_64.yml +++ /dev/null @@ -1,27 +0,0 @@ -docker: - variables: - VERSION: latest - DOCKER_HOST: tcp://docker:2375 - - stage: build - - 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 - - script: - - if [ -f init ]; then chmod 500 init; fi - - echo -n ${CI_COMMIT_SHORT_SHA} > VERSION - - rm -rf vendor/ database/schema database/seeders database/factories/* - - docker build -t ${CI_REGISTRY_IMAGE}:${VERSION} . - - docker push ${CI_REGISTRY_IMAGE}:${VERSION} - tags: - - docker - - x86_64 - only: - - master diff --git a/.gitlab-test.yml b/.gitlab-test.yml deleted file mode 100644 index 01c6727..0000000 --- a/.gitlab-test.yml +++ /dev/null @@ -1,48 +0,0 @@ -test: - image: ${CI_REGISTRY}/leenooks/php:8.1-fpm-alpine-mysql-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: - - mariadb:10.5 - - variables: - MYSQL_DATABASE: testing - MYSQL_ROOT_PASSWORD: test - MYSQL_USER: test - MYSQL_PASSWORD: test - - tags: - - php - only: - - master - - test - - 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 - - # Add mysql client for schema pre-load - - apt update -o Acquire::ForceIPv4=true && apt install -o Acquire::ForceIPv4=true -y mariadb-client - - # Generate an application key. Re-cache. - - php artisan key:generate --env=testing - - php artisan config:cache --env=testing - - php artisan migrate - - php artisan db:seed - - script: - # run laravel tests - - XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text --colors=never - - # 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 diff --git a/Dockerfile b/docker/Dockerfile similarity index 77% rename from Dockerfile rename to docker/Dockerfile index 470e29a..d3969df 100644 --- a/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.dege.au/leenooks/php:8.1-fpm-alpine-mysql +FROM gitea.dege.au/docker/php:8.3-fpm-pgsql COPY . /var/www/html/ @@ -6,7 +6,9 @@ RUN mkdir -p ${COMPOSER_HOME} \ && ([ -r auth.json ] && mv auth.json ${COMPOSER_HOME}) || true \ && touch .composer.refresh \ && mv .env.example .env \ + && apk add --no-cache git \ && FORCE_PERMS=1 NGINX_START=FALSE /sbin/init \ + && apk del --no-cache git \ && chmod +x /var/www/html/artisan \ && /var/www/html/artisan storage:link \ && rm -rf ${COMPOSER_HOME}/* .git* composer.lock