From 4cc84d8b13a845fe83f145975b3566101248540c Mon Sep 17 00:00:00 2001
From: Ulf Seltmann <seltmann@ub.uni-leipzig.de>
Date: Wed, 6 Jun 2018 14:46:28 +0200
Subject: [PATCH] * updated image-tags * removed sslcafile-config
---
docker-compose.yml | 10 ++++++----
local/config/vufind/config.ini | 10 +++++-----
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index cd883718ef7..3aa643509a1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
version: '2'
services:
php:
- image: ubleipzig/vufind-php:5.6-5-debug
+ image: ubleipzig/vufind-php:5.6-7-debug
volumes:
- ./:/usr/local/vufind
environment:
@@ -42,7 +42,7 @@ services:
- mail-data:/home/dev/Maildir:z
grunt:
- image: ubleipzig/vufind-php:5.6-5-debug
+ image: ubleipzig/vufind-php:5.6-7-debug
volumes:
- ./:/usr/local/vufind:z
- npm-cache:/home/www-data/.npm
@@ -51,7 +51,7 @@ services:
command: npm install && node_modules/.bin/grunt watch
composer:
- image: ubleipzig/vufind-php:7.2-5-debug
+ image: ubleipzig/vufind-php:7.2-7-debug
volumes:
- ./:/usr/local/vufind:z
- composer-cache:/home/www-data/.composer
@@ -61,7 +61,7 @@ services:
command: phing composer -Dcomposer_extra_params=--no-scripts
autoconfig:
- image: ubleipzig/vufind-php:5.6-5-debug
+ image: ubleipzig/vufind-php:5.6-7-debug
volumes:
- ./:/usr/local/vufind:z
environment:
@@ -89,6 +89,8 @@ volumes:
networks:
default:
+ driver_opts:
+ com.docker.network.bridge.name: vufind-docker-bridge
driver: bridge
ipam:
driver: default
diff --git a/local/config/vufind/config.ini b/local/config/vufind/config.ini
index b45f636b86b..1bb8e427320 100644
--- a/local/config/vufind/config.ini
+++ b/local/config/vufind/config.ini
@@ -677,7 +677,7 @@ noCoverAvailableImage = images/noCover2.gif
; You can select from Google, OpenLibrary, HathiTrust. You should consult
; http://code.google.com/apis/books/branding.html before using Google Book Search.
; previews = Google,OpenLibrary,HathiTrust
-
+
; Possible HathiRights options = pd,ic,op,orph,und,umall,ic-world,nobody,pdus,cc-by,cc-by-nd,
; cc-by-nc-nd,cc-by-nc,cc-by-nc-sa,cc-by-sa,orphcand,cc-zero,und-world,icus
; Default is "pd,ic-world" if unset here.
@@ -783,7 +783,7 @@ noCoverAvailableImage = images/noCover2.gif
; details before turning this on.
[Buchhandel]
url = "https://api.vlb.de/api/v1/cover/"
-; token = "XXXXXX-XXXX-XXXXX-XXXXXXXXXXXX"
+; token = "XXXXXX-XXXX-XXXXX-XXXXXXXXXXXX"
[QRCode]
; This setting controls the image to display when no qrcode is available.
@@ -971,7 +971,7 @@ url = https://www.myendnoteweb.com/EndNoteWeb.html
; the \Zend\Http\Client's setOptions method.
[Http]
;sslcapath = "/etc/ssl/certs" ; e.g. for Debian systems
-sslcafile = "/etc/pki/tls/cert.pem" ; e.g. for CentOS systems
+;sslcafile = "/etc/pki/tls/cert.pem" ; e.g. for CentOS systems
;timeout = 30 ; default timeout if not overridden by more specific code/settings
@@ -1126,7 +1126,7 @@ era = true ; allow browsing of era subdivisions
; <result_limit> most popular entries -- it only affects display order.
;alphabetical_order = true
-; This section controls the availability of export methods.
+; This section controls the availability of export methods.
;
; Each entry may be a comma-separated list of contexts in which the export
; option will be presented. Valid options:
@@ -1437,7 +1437,7 @@ max_tag_length = 64
; *****************
; * BOF finc
; *****************
-; This section allows to set identifiers and other information which are specific
+; This section allows to set identifiers and other information which are specific
; for the library.
;[InstitutionInfo]
;bibid = "BIBID"
--
GitLab