Skip to content

Commit 29bdcab

Browse files
committed
removed vhost from main apache conf and added make install to compile process in dockerfile
1 parent af9d800 commit 29bdcab

File tree

2 files changed

+1
-26
lines changed

2 files changed

+1
-26
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apt-get update -y && apt-get install -y gcc g++ wget make git apache2 libapa
99
# download and compile iipsrv, sleeps prevent 'Text file busy' error
1010
WORKDIR /tmp/iip
1111
RUN git clone https://github.com/moravianlibrary/iipsrv-openjpeg.git ./
12-
RUN chmod +x ./configure && sleep 2 && ./configure && sleep 2 && make
12+
RUN chmod +x ./configure && sleep 2 && ./configure && sleep 2 && make && make install
1313

1414
# make www dir and copy iip binary into fcgi bin
1515
RUN mkdir -p /var/www/localhost/fcgi-bin

apache2.conf

-25
Original file line numberDiff line numberDiff line change
@@ -220,28 +220,3 @@ IncludeOptional sites-enabled/*.conf
220220

221221
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
222222

223-
# Create a directory for the iipsrv binary
224-
ScriptAlias /fcgi-bin/ "/var/www/localhost/fcgi-bin/"
225-
226-
# Set the options on that directory
227-
<Directory "/var/www/localhost/fcgi-bin/">
228-
AllowOverride None
229-
Options None
230-
Order allow,deny
231-
Allow from all
232-
233-
# Set the module handler
234-
AddHandler fcgid-script .fcgi
235-
</Directory>
236-
237-
# Set our environment variables for the IIP server
238-
FcgidInitialEnv VERBOSITY "5"
239-
FcgidInitialEnv LOGFILE "/tmp/iipsrv.log"
240-
FcgidInitialEnv MAX_IMAGE_CACHE_SIZE "10"
241-
FcgidInitialEnv JPEG_QUALITY "50"
242-
FcgidInitialEnv MAX_CVT "3000"
243-
244-
# Define the idle timeout as unlimited and the number of
245-
# processes we want
246-
FcgidIdleTimeout 0
247-
FcgidMaxProcessesPerClass 1

0 commit comments

Comments
 (0)