Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow overriding web config, fix #44 #45

Merged
merged 1 commit into from
Feb 4, 2017
Merged

allow overriding web config, fix #44 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ WORKDIR /ocr-fileformat
RUN apk add --no-cache openjdk8-jre php7 php7-json py-lxml git make ca-certificates wget bash \
&& update-ca-certificates \
&& make install \
&& cp docker.config.php web/config.local.php \
&& mv web /ocr-fileformat-web \
&& rm -rf /ocr-fileformat \
&& apk del git make wget
Expand Down
3 changes: 3 additions & 0 deletions docker.config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?php
$config['ocr-validate'] = '/usr/local/bin/ocr-validate';
$config['ocr-transform'] = '/usr/local/bin/ocr-transform';
5 changes: 5 additions & 0 deletions web/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
),
);

$local_settings = dirname(__FILE__) . '/config.local.php';
if (file_exists($local_settings)) {
include $local_settings;
}

/**
* List of installed transform from-to-tuples.
* List of installed schemas.
Expand Down