Skip to content

Commit 3651b4b

Browse files
committed
force eol=lf for text.
1 parent a0d5006 commit 3651b4b

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

examples/demo/Dockerfile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ RUN apt-get update \
88
curl bzip2 make gcc git-core \
99
apache2 libapache2-mod-fcgid libfcgi-dev \
1010
sqlite3 libsqlite3-dev \
11-
default-libmysqlclient-dev \
11+
default-libmysqlclient-dev \
12+
dos2unix \
1213
&& rm -rf /var/lib/apt/lists/*
1314

1415
#--no-install-recommends \
@@ -31,16 +32,17 @@ WORKDIR $HOME
3132
RUN mkdir $WEBDIR
3233

3334
#Build the debug EiffelWeb example and copy the executable to $HOME/
34-
COPY ./docker-inc/files/build_service_fcgi $HOME/build_service_fcgi
35+
COPY docker-inc/files/build_service_fcgi $HOME/build_service_fcgi
3536
USER root
36-
RUN chown eifweb:eifweb $HOME/build_service_fcgi && chmod 700 $HOME/build_service_fcgi
37+
RUN chown eifweb:eifweb $HOME/build_service_fcgi && chmod 755 $HOME/build_service_fcgi
3738
USER eifweb
38-
RUN $HOME/build_service_fcgi $HOME/www
39+
#RUN dos2unix $HOME/build_service_fcgi
40+
RUN ls -la $HOME && $HOME/build_service_fcgi $HOME/www
3941

4042
USER root
41-
COPY ./docker-inc/files/httpd.conf /etc/apache2/sites-enabled/000-default.conf
42-
ADD ./docker-inc/files/html $WEBDIR/html
43-
ADD ./site $WEBDIR/html/site
43+
COPY docker-inc/files/httpd.conf /etc/apache2/sites-enabled/000-default.conf
44+
ADD docker-inc/files/html $WEBDIR/html
45+
ADD site $WEBDIR/html/site
4446
RUN mkdir $WEBDIR/html/theme \
4547
&& mkdir $WEBDIR/html/site/www \
4648
&& ln -s $WEBDIR/html/site/files files \
@@ -50,6 +52,6 @@ RUN mkdir $WEBDIR/html/theme \
5052

5153
#Setup apache as foreground (for docker purpose)
5254
RUN mkdir -p /etc/service/apache
53-
ADD ./docker-inc/files/apache.sh /etc/service/apache/run
55+
ADD docker-inc/files/apache.sh /etc/service/apache/run
5456
RUN chmod +x /etc/service/apache/run
5557
ENTRYPOINT ["/etc/service/apache/run"]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto eol=lf

0 commit comments

Comments
 (0)