From 9e9b14f64471e87ba774f7b13052d56a5770de22 Mon Sep 17 00:00:00 2001 From: Grigory Romodanovskiy Date: Mon, 1 Aug 2022 22:34:21 -0400 Subject: [PATCH 1/9] Create publish-docker.yaml --- .github/workflows/publish-docker.yaml | 37 +++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/publish-docker.yaml diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml new file mode 100644 index 0000000..710d6f1 --- /dev/null +++ b/.github/workflows/publish-docker.yaml @@ -0,0 +1,37 @@ +name: Create and publish a Docker image + +on: + release: + types: [published] + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + +jobs: + build-and-publish: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - name: Checkout repository + uses: actions/checkout@v3 + with: + submodules: 'recursive' + - name: Log in to the Container registry + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build and push Docker image + uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} From ff7163280536a26472521065ce93ce2b1c00fabd Mon Sep 17 00:00:00 2001 From: Grigory Romodanovskiy Date: Mon, 1 Aug 2022 22:37:28 -0400 Subject: [PATCH 2/9] Update publish-docker.yaml --- .github/workflows/publish-docker.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 710d6f1..ab49212 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -27,7 +27,11 @@ jobs: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - name: Build and push Docker image uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc with: From 6ea4fa002625663dd46c11e5e479e585b880d0fd Mon Sep 17 00:00:00 2001 From: Grigory Romodanovskiy Date: Mon, 1 Aug 2022 22:46:55 -0400 Subject: [PATCH 3/9] Update publish-docker.yaml --- .github/workflows/publish-docker.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index ab49212..8808e06 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -3,8 +3,6 @@ name: Create and publish a Docker image on: release: types: [published] - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: env: REGISTRY: ghcr.io From 804a5229abaaf084e55372084db5c52c5064e1b6 Mon Sep 17 00:00:00 2001 From: greg2010 Date: Tue, 2 Aug 2022 00:36:56 -0400 Subject: [PATCH 4/9] split images, pull more env vars out --- .env.example | 18 +++++++++++- .github/workflows/publish-docker.yaml | 13 +++++++-- config/pathfinder/config.ini | 2 +- docker-compose.yml | 22 +++++++------- Dockerfile => pathfinder.Dockerfile | 10 ++++--- pf-websocket.Dockerfile | 7 +++++ static/entrypoint.sh | 2 +- static/nginx/nginx.conf | 6 ++-- static/pathfinder/environment.ini | 42 +++++++++++++-------------- static/php/php.ini | 2 +- 10 files changed, 78 insertions(+), 46 deletions(-) rename Dockerfile => pathfinder.Dockerfile (81%) create mode 100644 pf-websocket.Dockerfile diff --git a/.env.example b/.env.example index fdf6057..effb59d 100644 --- a/.env.example +++ b/.env.example @@ -1,8 +1,24 @@ PROJECT_ROOT="" -CONTAINER_NAME="pf" DOMAIN="" APP_PASSWORD="" +MYSQL_HOST="" +MYSQL_PORT="3306" +MYSQL_USER="root" MYSQL_PASSWORD="" +MYSQL_PF_DB_NAME="pathfinder" +MYSQL_UNIVERSE_DB_NAME="eve_universe" +MYSQL_CCP_DB_NAME="eve_lifeblood_min" +REDIS_HOST="" +REDIS_PORT="6379" CCP_SSO_CLIENT_ID="" CCP_SSO_SECRET_KEY="" CCP_ESI_SCOPES="esi-location.read_online.v1,esi-location.read_location.v1,esi-location.read_ship_type.v1,esi-ui.write_waypoint.v1,esi-ui.open_window.v1,esi-universe.read_structures.v1,esi-corporations.read_corporation_membership.v1,esi-clones.read_clones.v1,esi-characters.read_corporation_roles.v1" +PATHFINDER_SOCKET_HOST="" +PATHFINDER_SOCKET_PORT="5555" +SMTP_HOST="" +SMTP_PORT="" +SMTP_SCHEME="" +SMTP_USER="" +SMTP_PASS="" +SMTP_FROM="" +SMTP_ERROR="" \ No newline at end of file diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 8808e06..87bb4e8 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -6,11 +6,19 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} + IMAGE_NAME_OWNER: ${{ github.repository_owner }} jobs: build-and-publish: runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - dockerfile: ./pathfinder.Dockerfile + image_name: pathfinder + - dockerfile: ./pf-websocket.Dockerfile + image_name: pf-websocket permissions: contents: read packages: write @@ -29,11 +37,12 @@ jobs: id: meta uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_OWNER }}/${{ matrix.image_name }} - name: Build and push Docker image uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc with: context: . + file: ${{ matrix.dockerfile }} push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/config/pathfinder/config.ini b/config/pathfinder/config.ini index 6bc858e..3c11fcf 100644 --- a/config/pathfinder/config.ini +++ b/config/pathfinder/config.ini @@ -53,7 +53,7 @@ SEED = {{ md5(@SERVER.SERVER_NAME) }} ; - Cache data is stored on disc ; redis=[SERVER] ; - Cache data is stored in Redis. redis=[host]:[port]:[db]:[auth] (e.g. redis=localhost:6379:1:myPass) -CACHE = redis=${CONTAINER_NAME}-redis:6379 +CACHE = redis=${REDIS_HOST}:${REDIS_PORT} ; Cache backend for API data ; This sets the cache backend for API response data and other temp data relates to API requests. diff --git a/docker-compose.yml b/docker-compose.yml index 5b1fca3..8767b77 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,18 +5,16 @@ services: image: bianjp/mariadb-alpine:latest environment: MYSQL_ROOT_PASSWORD: $MYSQL_PASSWORD - container_name: "$CONTAINER_NAME-db" networks: pf: aliases: - - "${CONTAINER_NAME}db" + - "$MYSQL_HOST" volumes: - db_data:/var/lib/mysql - $PROJECT_ROOT/pathfinder/export/sql/eve_universe.sql.zip:/eve_universe.sql.zip restart: always pf-redis: image: redis:6.2.5-alpine3.14 - container_name: "$CONTAINER_NAME-redis" command: ["redis-server", "--appendonly", "yes"] hostname: redis volumes: @@ -24,26 +22,26 @@ services: networks: pf: aliases: - - "$CONTAINER_NAME-redis" + - "$REDIS_HOST" logging: driver: none restart: always pf-socket: - image: composer:composer@sha256:d374b2e1f715621e9d9929575d6b35b11cf4a6dc237d4a08f2e6d1611f534675 - container_name: "$CONTAINER_NAME-socket" - command: ["sh","-c","composer install && php cmd.php --tcpHost 0.0.0.0"] + build: + context: '.' + dockerfile: '$PROJECT_ROOT/pf-websocket.Dockerfile' + command: ["--tcpHost", "0.0.0.0"] hostname: socket - volumes: - - ${PROJECT_ROOT}/websocket:/app networks: pf: aliases: - - "$CONTAINER_NAME-socket" + - "$PATHFINDER_SOCKET_HOST" restart: always pf: - container_name: ${CONTAINER_NAME} hostname: "pathfinder" - build: '.' + build: + context: '.' + dockerfile: '$PROJECT_ROOT//pathfinder.Dockerfile' env_file: - .env labels: diff --git a/Dockerfile b/pathfinder.Dockerfile similarity index 81% rename from Dockerfile rename to pathfinder.Dockerfile index e149c2e..3f8aa46 100644 --- a/Dockerfile +++ b/pathfinder.Dockerfile @@ -2,9 +2,11 @@ FROM php:7.2.11-fpm-alpine3.7 as build RUN apk update \ && apk add --no-cache libpng-dev zeromq-dev git \ - $PHPIZE_DEPS \ - && docker-php-ext-install gd && docker-php-ext-install pdo_mysql && pecl install redis && docker-php-ext-enable redis && pecl install channel://pecl.php.net/zmq-1.1.3 && docker-php-ext-enable zmq \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer + $PHPIZE_DEPS \ + && docker-php-ext-install gd && docker-php-ext-install pdo_mysql && \ + pecl install redis && docker-php-ext-enable redis && \ + pecl install channel://pecl.php.net/zmq-1.1.3 && docker-php-ext-enable zmq && \ + curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer COPY pathfinder /app WORKDIR /app @@ -33,7 +35,7 @@ COPY static/entrypoint.sh / WORKDIR /var/www/html COPY --chown=nobody --from=build /app pathfinder -RUN chmod 0766 pathfinder/logs pathfinder/tmp/ && rm index.php && touch /etc/nginx/.setup_pass && chmod +x /entrypoint.sh +RUN chmod 0766 pathfinder/logs pathfinder/tmp/ && rm index.php && touch /etc/nginx/.setup_pass && chmod +x /entrypoint.sh COPY static/pathfinder/routes.ini /var/www/html/pathfinder/app/ COPY static/pathfinder/environment.ini /var/www/html/pathfinder/app/templateEnvironment.ini diff --git a/pf-websocket.Dockerfile b/pf-websocket.Dockerfile new file mode 100644 index 0000000..58eed9b --- /dev/null +++ b/pf-websocket.Dockerfile @@ -0,0 +1,7 @@ +FROM composer:2.3.10 +COPY websocket /app +WORKDIR /app + +RUN composer install + +ENTRYPOINT ["/usr/local/bin/php", "cmd.php"] diff --git a/static/entrypoint.sh b/static/entrypoint.sh index f627dfd..335605a 100644 --- a/static/entrypoint.sh +++ b/static/entrypoint.sh @@ -2,7 +2,7 @@ set -e crontab /var/crontab.txt envsubst '$DOMAIN' /etc/nginx/sites_enabled/site.conf -envsubst '$CONTAINER_NAME' /etc/nginx/nginx.conf +envsubst '$PATHFINDER_SOCKET_HOST' /etc/nginx/nginx.conf envsubst /var/www/html/pathfinder/app/environment.ini envsubst /var/www/html/pathfinder/app/config.ini envsubst /etc/php7/conf.d/zzz_custom.ini diff --git a/static/nginx/nginx.conf b/static/nginx/nginx.conf index 3d6c056..333a3d4 100755 --- a/static/nginx/nginx.conf +++ b/static/nginx/nginx.conf @@ -165,10 +165,10 @@ http { } upstream websocket { - server ${CONTAINER_NAME}-socket:8020; + server ${PATHFINDER_SOCKET_HOST}:8020; } - + # Default log file @@ -235,7 +235,7 @@ http { # a specific directory, or on an individual server{} level. gzip_static off; - proxy_buffers 16 16k; + proxy_buffers 16 16k; proxy_buffer_size 16k; # Include files in the sites-enabled folder. server{} configuration files should be diff --git a/static/pathfinder/environment.ini b/static/pathfinder/environment.ini index 64628f6..5f4a967 100644 --- a/static/pathfinder/environment.ini +++ b/static/pathfinder/environment.ini @@ -15,23 +15,23 @@ URL = {{@SCHEME}}://$DOMAIN ; level of debug/error stack trace DEBUG = 0 ; Pathfinder database -DB_PF_DNS = mysql:host=${CONTAINER_NAME}db;port=3306;dbname= -DB_PF_NAME = pf -DB_PF_USER = root +DB_PF_DNS = mysql:host=${MYSQL_HOST};port=${MYSQL_PORT};dbname= +DB_PF_NAME = $MYSQL_PF_DB_NAME +DB_PF_USER = $MYSQL_USER DB_PF_PASS = $MYSQL_PASSWORD -; Universe data (New Eden) cache DB for ESI API respons -DB_UNIVERSE_DNS = mysql:host=${CONTAINER_NAME}db;port=3306;dbname= -DB_UNIVERSE_NAME = eve_universe -DB_UNIVERSE_USER = root +; Universe data (New Eden) cache DB for ESI API response +DB_UNIVERSE_DNS = mysql:host=${MYSQL_HOST};port=${MYSQL_PORT};dbname= +DB_UNIVERSE_NAME = $MYSQL_UNIVERSE_DB_NAME +DB_UNIVERSE_USER = $MYSQL_USER DB_UNIVERSE_PASS = $MYSQL_PASSWORD ; EVE-Online CCP Database export -DB_CCP_DNS = mysql:host=${CONTAINER_NAME}db;port=3306;dbname= -DB_CCP_NAME = eve_lifeblood_min -DB_CCP_USER = root -DB_CCP_PASS = $MYSQL_PASSWORD +DB_CCP_DNS = mysql:host=${MYSQL_HOST};port=${MYSQL_PORT};dbname= +DB_CCP_NAME = $MYSQL_CCP_DB_NAME +DB_CCP_USER = $MYSQL_USER +DB_CCP_PASS = $MYSQL_PASSWORD ; CCP SSO CCP_SSO_URL = https://login.eveonline.com @@ -43,19 +43,19 @@ CCP_SSO_DOWNTIME = 11:00 ; CCP ESI API CCP_ESI_URL = https://esi.evetech.net CCP_ESI_DATASOURCE = tranquility -CCP_ESI_SCOPES = $CCP_ESI_SCOPES +CCP_ESI_SCOPES = $CCP_ESI_SCOPES CCP_ESI_SCOPES_ADMIN = ; SMTP settings (optional) -SMTP_HOST = localhost -SMTP_PORT = 25 -SMTP_SCHEME = TLS -SMTP_USER = -SMTP_PASS = +SMTP_HOST = $SMTP_HOST +SMTP_PORT = $SMTP_PORT +SMTP_SCHEME = $SMTP_SCHEME +SMTP_USER = $SMTP_USER +SMTP_PASS = $SMTP_PASS -SMTP_FROM = registration@pathfinder-w.space -SMTP_ERROR = admin@pathfinder-w.space +SMTP_FROM = $SMTP_FROM +SMTP_ERROR = $SMTP_EMAIL ; TCP Socket configuration (optional) (advanced) -SOCKET_HOST = ${CONTAINER_NAME}-socket -SOCKET_PORT = 5555 +SOCKET_HOST = $PATHFINDER_SOCKET_HOST +SOCKET_PORT = $PATHFINDER_SOCKET_PORT diff --git a/static/php/php.ini b/static/php/php.ini index 0b403a3..e17d3c2 100755 --- a/static/php/php.ini +++ b/static/php/php.ini @@ -9,7 +9,7 @@ fastcgi.impersonate=1 fastcgi.logging=0 request_terminate_timeout = 300 session.save_handler = redis -session.save_path = "tcp://${CONTAINER_NAME}-redis:6379" +session.save_path = "tcp://${REDIS_HOST}:${REDIS_PORT}" [Date] date.timezone="UTC" From ba11d2a3ab6ba28c6bd7c7e1f64471609af0745a Mon Sep 17 00:00:00 2001 From: greg2010 Date: Tue, 23 Aug 2022 20:24:23 -0400 Subject: [PATCH 5/9] update readme --- README.md | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ccdfa6b..4440f4f 100644 --- a/README.md +++ b/README.md @@ -46,15 +46,31 @@ A fork of techfreak's [Pathfinder-container](https://gitlab.com/techfreak/pathfi 1. **Create a *.env* file (copy .env.example) and make sure every config option has an entry.** ```shell - PROJECT_ROOT="" # The path of the cloned repo + PROJECT_ROOT="" # The path of the cloned repo CONTAINER_NAME="pf" # docker container name prefix DOMAIN="" # The domain you will be using APP_PASSWORD="" # Password for /setup - MYSQL_PASSWORD="" # Mysql Password + MYSQL_HOST="mariadb" # mysql host + MYSQL_PORT="3306" # default mysql port + MYSQL_USER="root" # mysql root user + MYSQL_PASSWORD="" # mysql Password CCP_SSO_CLIENT_ID="" # Use the SSO tokens created in step 1 - CCP_SSO_SECRET_KEY="" + CCP_SSO_SECRET_KEY="" CCP_ESI_SCOPES="esi-location.read_online.v1,esi-location.read_location.v1,esi-location.read_ship_type.v1,esi-ui.write_waypoint.v1,esi-ui.open_window.v1,esi-universe.read_structures.v1,esi-corporations.read_corporation_membership.v1,esi-clones.read_clones.v1,esi-characters.read_corporation_roles.v1" - + MYSQL_PF_DB_NAME="pathfinder" # mysql pathfinder table name + MYSQL_UNIVERSE_DB_NAME="eve_universe" + MYSQL_CCP_DB_NAME="eve_lifeblood_min" + REDIS_HOST="redis" # redis host + REDIS_PORT="6379" # default redis port + PATHFINDER_SOCKET_HOST="pathfinder-socket" # domain of the websocket container, relative to the main pf container + PATHFINDER_SOCKET_PORT="5555" # default tcp socket port + SMTP_HOST="" + SMTP_PORT="" + SMTP_SCHEME="" + SMTP_USER="" + SMTP_PASS="" + SMTP_FROM="" + SMTP_ERROR="" > The `PROJECT_ROOT` key is the *absolute* path to the project directory, ie if you have clone it to /app/pathfinder-containers, this is the value you should enter. If you're unsure of the absolute path, you can use the command `pwd` to get the full absolute path of the current directory. 1. **Edit the *config/pathfinder/pathfinder.ini*** to your liking From efa20c6ae00af2ae7b8f05370b57055406f473b1 Mon Sep 17 00:00:00 2001 From: greg2010 Date: Tue, 23 Aug 2022 20:43:27 -0400 Subject: [PATCH 6/9] add mysql and redis hosts to .env.example --- .env.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index effb59d..b4f8620 100644 --- a/.env.example +++ b/.env.example @@ -1,14 +1,14 @@ PROJECT_ROOT="" DOMAIN="" APP_PASSWORD="" -MYSQL_HOST="" +MYSQL_HOST="mariadb" MYSQL_PORT="3306" MYSQL_USER="root" MYSQL_PASSWORD="" MYSQL_PF_DB_NAME="pathfinder" MYSQL_UNIVERSE_DB_NAME="eve_universe" MYSQL_CCP_DB_NAME="eve_lifeblood_min" -REDIS_HOST="" +REDIS_HOST="redis" REDIS_PORT="6379" CCP_SSO_CLIENT_ID="" CCP_SSO_SECRET_KEY="" From 2b6df18a9af686673154ea0502b66cf164ca754a Mon Sep 17 00:00:00 2001 From: greg2010 Date: Tue, 23 Aug 2022 20:46:20 -0400 Subject: [PATCH 7/9] add PATHFINDER_SOCKET_HOST to .env.example --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index b4f8620..e092b9a 100644 --- a/.env.example +++ b/.env.example @@ -13,7 +13,7 @@ REDIS_PORT="6379" CCP_SSO_CLIENT_ID="" CCP_SSO_SECRET_KEY="" CCP_ESI_SCOPES="esi-location.read_online.v1,esi-location.read_location.v1,esi-location.read_ship_type.v1,esi-ui.write_waypoint.v1,esi-ui.open_window.v1,esi-universe.read_structures.v1,esi-corporations.read_corporation_membership.v1,esi-clones.read_clones.v1,esi-characters.read_corporation_roles.v1" -PATHFINDER_SOCKET_HOST="" +PATHFINDER_SOCKET_HOST="pathfinder-socket" PATHFINDER_SOCKET_PORT="5555" SMTP_HOST="" SMTP_PORT="" From 8c74edbcf19aeb366a2b37a25faa2faf3537d0dd Mon Sep 17 00:00:00 2001 From: greg2010 Date: Fri, 28 Oct 2022 00:21:29 -0400 Subject: [PATCH 8/9] bump version to v2.2.1 --- config/pathfinder/pathfinder.ini | 2 +- pathfinder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/pathfinder/pathfinder.ini b/config/pathfinder/pathfinder.ini index 123685c..eb435cc 100644 --- a/config/pathfinder/pathfinder.ini +++ b/config/pathfinder/pathfinder.ini @@ -14,7 +14,7 @@ NAME = Pathfinder Community Edition ; e.g. public/js/vX.X.X/app.js ; Syntax: String (current version) ; Default: v2.2.0 -VERSION = v2.2.0 +VERSION = v2.2.1 ; Contact information [optional] ; Shown on 'licence', 'contact' page. diff --git a/pathfinder b/pathfinder index 441f1fd..58d9bb1 160000 --- a/pathfinder +++ b/pathfinder @@ -1 +1 @@ -Subproject commit 441f1fd8084751a6318c744787ac08ca9acc4f2f +Subproject commit 58d9bb1ac2b11c6b6b0a44f613bf58a5a0ce6486 From 10c21b1bdad4551872b638178d6b2177c7f0b5ad Mon Sep 17 00:00:00 2001 From: greg2010 Date: Fri, 24 Feb 2023 23:49:41 -0500 Subject: [PATCH 9/9] bump version to v2.2.2 --- config/pathfinder/pathfinder.ini | 4 ++-- pathfinder | 2 +- pathfinder.Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/pathfinder/pathfinder.ini b/config/pathfinder/pathfinder.ini index eb435cc..129985f 100644 --- a/config/pathfinder/pathfinder.ini +++ b/config/pathfinder/pathfinder.ini @@ -13,8 +13,8 @@ NAME = Pathfinder Community Edition ; Version is used for CSS/JS cache busting and is part of the URL for static resources: ; e.g. public/js/vX.X.X/app.js ; Syntax: String (current version) -; Default: v2.2.0 -VERSION = v2.2.1 +; Default: v2.2.2 +VERSION = v2.2.2 ; Contact information [optional] ; Shown on 'licence', 'contact' page. diff --git a/pathfinder b/pathfinder index 58d9bb1..b73f372 160000 --- a/pathfinder +++ b/pathfinder @@ -1 +1 @@ -Subproject commit 58d9bb1ac2b11c6b6b0a44f613bf58a5a0ce6486 +Subproject commit b73f3726ee5e3a2581b75fd83e851d20ea61bec5 diff --git a/pathfinder.Dockerfile b/pathfinder.Dockerfile index 3f8aa46..d04b382 100644 --- a/pathfinder.Dockerfile +++ b/pathfinder.Dockerfile @@ -15,7 +15,7 @@ RUN composer self-update 2.1.8 RUN composer install FROM trafex/alpine-nginx-php7:ba1dd422 -RUN apk update && apk add --no-cache busybox-suid sudo php7-redis php7-pdo php7-pdo_mysql php7-fileinfo shadow gettext bash apache2-utils +RUN apk update && apk add --no-cache busybox-suid sudo php7-redis php7-pdo php7-pdo_mysql php7-fileinfo php7-event shadow gettext bash apache2-utils COPY static/nginx/nginx.conf /etc/nginx/templateNginx.conf # we need to create sites_enabled directory in order for entrypoint.sh being able to copy file after envsubst