From f1b3c7157d4ab8038222acf6c90fb1c3c384ec4c Mon Sep 17 00:00:00 2001 From: Jason Gessner Date: Mon, 18 Apr 2022 09:20:14 -0500 Subject: [PATCH 1/2] Update image url for CDN. --- dev-parameters.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-parameters.yml b/dev-parameters.yml index 1e2dda3..6f4138f 100644 --- a/dev-parameters.yml +++ b/dev-parameters.yml @@ -43,6 +43,6 @@ parameters: oauth_test_client_secret: ~ oauth_test_redirect_uri: ~ images_path: ~ - card_image_url: 'https://netrunnerdb.com/card_image' + card_image_url: 'https://assets.netrunnerdb.com/v1/' # slack_webhook_url: ~ # slack_webhook_channel: ~ From 2274f173953491d4b14ba4447f146375eef0cb39 Mon Sep 17 00:00:00 2001 From: Jason Gessner Date: Sun, 29 May 2022 12:01:47 -0500 Subject: [PATCH 2/2] Switch to port 8080 to allow private Oauth API dev locally. --- 000-default.conf | 2 +- Dockerfile | 7 ++++--- docker-compose.yml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/000-default.conf b/000-default.conf index b9022f7..c3eaf33 100644 --- a/000-default.conf +++ b/000-default.conf @@ -1,4 +1,4 @@ - + # The ServerName directive sets the request scheme, hostname and port that # the server uses to identify itself. This is used when creating # redirection URLs. In the context of virtual hosts, the ServerName diff --git a/Dockerfile b/Dockerfile index 24b287a..df1de5f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,8 +9,9 @@ RUN apt-get update && apt-get install -y \ RUN docker-php-ext-install zip pdo_mysql -RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer - +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer +# Listen on port 8080 instead of 80 in order to allow local development against the private Oauth API. +RUN sed -i "s/Listen 80/Listen 8080/" /etc/apache2/ports.conf COPY 000-default.conf /etc/apache2/sites-available # Allow composer to create cache @@ -18,7 +19,7 @@ RUN chown -R www-data:www-data /var/www USER root -EXPOSE 80 +EXPOSE 8080 CMD ["apache2-foreground"] diff --git a/docker-compose.yml b/docker-compose.yml index 59235a1..0a5265b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: depends_on: - nrdb-dev-db ports: - - "8080:80" + - "8080:8080" links: - nrdb-dev-db volumes: