diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4782023..385302c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,8 +33,8 @@ jobs: sudo apt-get install -y wget sudo mkdir -p /usr/src/pandoc cd /usr/src/pandoc - sudo wget https://github.com/jgm/pandoc/releases/download/2.9.2/pandoc-2.9.2-1-amd64.deb - sudo dpkg -i pandoc-2.9.2-1-amd64.deb + sudo wget https://github.com/jgm/pandoc/releases/download/2.15/pandoc-2.15-1-amd64.deb + sudo dpkg -i pandoc-2.15-1-amd64.deb - name: Install Dependencies (PHP vendors) run: composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist @@ -59,6 +59,7 @@ jobs: mirror_to_gitlab: runs-on: ubuntu-latest needs: tests + if: ${{ github.ref_name == 'main' }} steps: - uses: actions/checkout@v2.3.5 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b94298..d3d8676 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,14 +63,6 @@ build_mysql: - docker-compose logs nginx php mysql mysql_test redis - docker-compose down -.sonarqube: - stage: test - image: - name: ueberdosis/sonar-scanner - entrypoint: [""] - script: - - sonar-scanner -Dsonar.host.url=$SONAR_HOST -Dsonar.login=$SONAR_LOGIN -Dsonar.projectKey=$SONAR_PROJECT_KEY - release_nginx: stage: release only: diff --git a/README.md b/README.md index 3b11c09..be38d96 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Build Status](https://github.com/ueberdosis/alldocs.app/workflows/build/badge.svg)](https://github.com/ueberdosis/alldocs.app/actions) [![Sponsor](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub)](https://github.com/sponsors/ueberdosis) -This is an online converter for text files, based on [pandoc](https://github.com/jgm/pandoc). It’s free and open source. The main branch is automatically mirrored and deployed to https://alldocs.app. +This is an online converter for text files, based on [pandoc](https://github.com/jgm/pandoc). It’s free and open source. ## Technologies diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 6cc1fb0..595ec21 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -27,7 +27,7 @@ x-resources: &resources services: nginx: - image: registry.ueberlab.com/ueberdosis/alldocs.app/nginx:${BRANCH_NAME:-master} + image: ${IMAGE}/nginx:${BRANCH_NAME:-master} deploy: labels: - "traefik.enable=true" @@ -45,7 +45,7 @@ services: - srv-proxy - tier1 php: - image: registry.ueberlab.com/ueberdosis/alldocs.app/php:${BRANCH_NAME:-master} + image: ${IMAGE}/php:${BRANCH_NAME:-master} <<: *laravel-env deploy: <<: *resources @@ -56,7 +56,7 @@ services: volumes: - laravel-storage:/var/www/storage/ scheduler: - image: registry.ueberlab.com/ueberdosis/alldocs.app/php:${BRANCH_NAME:-master} + image: ${IMAGE}/php:${BRANCH_NAME:-master} command: ["scheduler"] <<: *laravel-env deploy: @@ -68,7 +68,7 @@ services: volumes: - laravel-storage:/var/www/storage/ worker: - image: registry.ueberlab.com/ueberdosis/alldocs.app/php:${BRANCH_NAME:-master} + image: ${IMAGE}/php:${BRANCH_NAME:-master} command: ["worker"] <<: *laravel-env deploy: @@ -80,7 +80,7 @@ services: volumes: - laravel-storage:/var/www/storage/ mysql: - image: registry.ueberlab.com/ueberdosis/alldocs.app/mysql:${BRANCH_NAME:-master} + image: ${IMAGE}/mysql:${BRANCH_NAME:-master} deploy: <<: *resources environment: diff --git a/docker/mysql/Dockerfile b/docker/mysql/Dockerfile index 79e6207..1f62044 100644 --- a/docker/mysql/Dockerfile +++ b/docker/mysql/Dockerfile @@ -1,4 +1,4 @@ -FROM mariadb:10.4 +FROM --platform=amd64 mariadb:10.4 LABEL maintainer "Patrick Baber " COPY docker/mysql/usr/local/bin/docker-healthcheck.sh /usr/local/bin/docker-healthcheck.sh diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index 89bc792..c2b6bac 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM node:13 AS node +FROM --platform=amd64 node:13 AS node LABEL maintainer "Patrick Baber " WORKDIR /var/www @@ -14,7 +14,7 @@ RUN yarn install && \ yarn build && \ rm -Rf node_modules -FROM nginx:1.17-alpine +FROM --platform=amd64 nginx:1.17-alpine LABEL maintainer "Patrick Baber " COPY docker/nginx/etc/default.conf /etc/nginx/conf.d/default.conf diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 0d294e0..62d4f96 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -1,4 +1,4 @@ -FROM node:13 AS node +FROM --platform=amd64 node:13 AS node LABEL maintainer "Patrick Baber " WORKDIR /var/www @@ -15,7 +15,7 @@ RUN yarn install && \ rm -Rf node_modules -FROM php:7.4-fpm-buster +FROM --platform=amd64 php:7.4-fpm-buster LABEL maintainer "Patrick Baber " # Install PHP dependencies @@ -40,8 +40,8 @@ RUN apt-get update && \ apt-get install -y wget && \ mkdir -p /usr/src/pandoc && \ cd /usr/src/pandoc && \ - wget https://github.com/jgm/pandoc/releases/download/2.9.2/pandoc-2.9.2-1-amd64.deb && \ - dpkg -i pandoc-2.9.2-1-amd64.deb && \ + wget https://github.com/jgm/pandoc/releases/download/2.15/pandoc-2.15-1-amd64.deb && \ + dpkg -i pandoc-2.15-1-amd64.deb && \ apt-get purge -y wget && \ rm -rf /usr/src/pandoc && \ rm -r /var/lib/apt/lists/* diff --git a/src/composer.json b/src/composer.json index 653c45c..39fb0cb 100644 --- a/src/composer.json +++ b/src/composer.json @@ -17,7 +17,7 @@ "sentry/sentry-laravel": "^1.9", "spatie/once": "^2.1", "symfony/yaml": "^5.2", - "ueberdosis/pandoc": "^0.5.0" + "ueberdosis/pandoc": "^0.8.0" }, "require-dev": { "facade/ignition": "^2.5", diff --git a/src/composer.lock b/src/composer.lock index 473c9fa..5217647 100644 --- a/src/composer.lock +++ b/src/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9e1dfc3b3b1dea66ecc80526be4fa541", + "content-hash": "3e9ace3e2261b98eb9bfecce18f69abe", "packages": [ { "name": "brick/math", @@ -6097,24 +6097,24 @@ }, { "name": "ueberdosis/pandoc", - "version": "0.5.0", + "version": "0.8.0", "source": { "type": "git", "url": "https://github.com/ueberdosis/pandoc.git", - "reference": "149921ad1543309391d6fa79a972a3f2a33f729f" + "reference": "fa1a575f5580cd7cfcfc0245c69562e11644b671" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ueberdosis/pandoc/zipball/149921ad1543309391d6fa79a972a3f2a33f729f", - "reference": "149921ad1543309391d6fa79a972a3f2a33f729f", + "url": "https://api.github.com/repos/ueberdosis/pandoc/zipball/fa1a575f5580cd7cfcfc0245c69562e11644b671", + "reference": "fa1a575f5580cd7cfcfc0245c69562e11644b671", "shasum": "" }, "require": { - "php": "^7.1", + "php": "^7.1|^8.0", "symfony/process": ">4.0" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^8.0 || ^9.0" }, "type": "library", "autoload": { @@ -6141,9 +6141,15 @@ ], "support": { "issues": "https://github.com/ueberdosis/pandoc/issues", - "source": "https://github.com/ueberdosis/pandoc/tree/master" + "source": "https://github.com/ueberdosis/pandoc/tree/0.8.0" }, - "time": "2020-03-20T12:01:54+00:00" + "funding": [ + { + "url": "https://github.com/sponsors/ueberdosis/", + "type": "github" + } + ], + "time": "2023-01-27T11:05:07+00:00" }, { "name": "vlucas/phpdotenv", @@ -9117,5 +9123,5 @@ "php": "^7.3" }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.3.0" }