Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 000-default.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<VirtualHost *:80>
<VirtualHost *:8080>
# 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
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@ 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
RUN chown -R www-data:www-data /var/www

USER root

EXPOSE 80
EXPOSE 8080

CMD ["apache2-foreground"]

Expand Down
2 changes: 1 addition & 1 deletion dev-parameters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ~
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
depends_on:
- nrdb-dev-db
ports:
- "8080:80"
- "8080:8080"
links:
- nrdb-dev-db
volumes:
Expand Down