From 45004444e6702c43992733bacd8f7fb471d86381 Mon Sep 17 00:00:00 2001
From: Kacper Donat <kadet1090@gmail.com>
Date: Sun, 23 Feb 2020 15:23:14 +0100
Subject: [PATCH] Various little fixes and improvements
---
docker/php/.env | 1 -
docker/php/Dockerfile | 5 ++++-
webpack.config.js | 7 +++++--
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/docker/php/.env b/docker/php/.env
index eb54481..ef3fd93 100644
--- a/docker/php/.env
+++ b/docker/php/.env
@@ -1,2 +1 @@
-XDEBUG_CONFIG=remote_host=172.17.0.1 remote_port=9001
PHP_IDE_CONFIG=serverName=czydojade
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index 6142fa0..08a914e 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -1,5 +1,7 @@
FROM php:7.3-fpm
+ARG XDEBUG_REMOTE_HOST="172.17.0.1"
+
RUN apt-get update && \
apt-get install -y --no-install-recommends git zip libzip-dev
@@ -7,7 +9,8 @@ RUN docker-php-ext-install zip
RUN pecl install xdebug-2.9.0 && docker-php-ext-enable xdebug
-RUN echo "xdebug.remote_enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini;
+RUN echo "xdebug.remote_enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
+ echo "xdebug.remote_host = ${XDEBUG_REMOTE_HOST}" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini;
RUN echo "date.timezone = Europe/Warsaw" >> /usr/local/etc/php/conf.d/datetime.ini;
RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
diff --git a/webpack.config.js b/webpack.config.js
index 367d75b..0382428 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -66,8 +66,11 @@ const config = {
new GenerateSW({
navigationPreload: true,
runtimeCaching: [{
- urlPattern: ({event}) => event.request.mode === 'navigate',
- handler: 'NetworkFirst',
+ urlPattern: ({ event }) => event.request.mode === 'navigate',
+ handler: 'NetworkFirst',
+ }, {
+ urlPattern: /^https?:\/\/api\.maptiler\.com\//,
+ handler: 'CacheFirst',
}],
swDest: '../service-worker.js'
})