Merge branch 'release/v0.0.4a'

StarCitizenWiki · Jun 23, 2020 · 3a43c1e · 3a43c1e
2 parents 0b0c1f7 + 9aa2cd4
commit 3a43c1e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 358 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -22,7 +22,8 @@ RUN apt-get update && \
         libsnmp-dev \
         libpcre3-dev \
         libtidy-dev \
-        libzip-dev
+        libzip-dev \
+        libonig-dev
 
 RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/
 
@@ -56,8 +57,8 @@ FROM php:7.4-apache as api
 
 COPY --from=extensions /usr/local/etc/php/conf.d/docker-php-ext-bcmath.ini /usr/local/etc/php/conf.d/docker-php-ext-bcmath.ini
 COPY --from=extensions /usr/local/etc/php/conf.d/docker-php-ext-intl.ini /usr/local/etc/php/conf.d/docker-php-ext-intl.ini
-COPY --from=extensions /usr/local/lib/php/extensions/no-debug-non-zts-20180731/intl.so /usr/local/lib/php/extensions/no-debug-non-zts-20180731/intl.so
-COPY --from=extensions /usr/local/lib/php/extensions/no-debug-non-zts-20180731/bcmath.so /usr/local/lib/php/extensions/no-debug-non-zts-20180731/bcmath.so
+COPY --from=extensions /usr/local/lib/php/extensions/no-debug-non-zts-20190902/intl.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/intl.so
+COPY --from=extensions /usr/local/lib/php/extensions/no-debug-non-zts-20190902/bcmath.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/bcmath.so
 
 LABEL stage=intermediate
 
@@ -89,7 +90,7 @@ COPY ./docker/vhost.conf /etc/apache2/sites-available/000-default.conf
 COPY ./docker/start.sh /usr/local/bin/start
 
 COPY --from=extensions /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/
-COPY --from=extensions /usr/local/lib/php/extensions/no-debug-non-zts-20180731/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20180731/
+COPY --from=extensions /usr/local/lib/php/extensions/no-debug-non-zts-20190902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/
 
 RUN sed -i -e "s/extension=zip.so/;extension=zip.so/" /usr/local/etc/php/conf.d/docker-php-ext-zip.ini && \
     echo 'memory_limit = 512M' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini && \

diff --git a/app/Jobs/Relay/Transcript/ImportMissingTranscripts.php b/app/Jobs/Relay/Transcript/ImportMissingTranscripts.php
@@ -40,6 +40,7 @@ class ImportMissingTranscripts extends BaseDownloadData implements ShouldQueue
      */
     public function __construct(int $startPage = null)
     {
+        throw new \RuntimeException('Cloudflare bypass missing.');
         $this->startPage = $startPage;
     }
 

diff --git a/composer.json b/composer.json
@@ -18,7 +18,6 @@
         "fabpot/goutte": "^3.3.0",
         "fideloper/proxy": "^4.4.0",
         "guzzlehttp/guzzle": "^6.5.5",
-        "jaymoulin/guzzlehttp-cloudflare": "^1.1.1",
         "laravel/framework": "^7.0",
         "laravel/ui": "^2.0",
         "mediawiki/oauthclient": "^1.1.0",
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         public function __construct(int $startPage = null)
         {
+            throw new \RuntimeException('Cloudflare bypass missing.');
             $this->startPage = $startPage;
         }
@@ Expand Down @@