Merge pull request #116 from ueberdosis/feature/update-pandoc

Feature/update pandoc

.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/[email protected]
 

.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:

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
 

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:

docker/mysql/Dockerfile

@@ -1,4 +1,4 @@
-FROM mariadb:10.4
+FROM --platform=amd64 mariadb:10.4
 LABEL maintainer "Patrick Baber <[email protected]>"
 
 COPY docker/mysql/usr/local/bin/docker-healthcheck.sh /usr/local/bin/docker-healthcheck.sh

docker/nginx/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:13 AS node
+FROM --platform=amd64 node:13 AS node
 LABEL maintainer "Patrick Baber <[email protected]>"
 
 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 <[email protected]>"
 
 COPY docker/nginx/etc/default.conf /etc/nginx/conf.d/default.conf

docker/php/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:13 AS node
+FROM --platform=amd64 node:13 AS node
 LABEL maintainer "Patrick Baber <[email protected]>"
 
 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 <[email protected]>"
 
 # 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/*

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",