Skip to content

Commit 356156b

Browse files
committed
improve server name config in docker file
1 parent db0e2f5 commit 356156b

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/Tasks/Implementations/Project/Cgi/Includes/dockerfile.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ strDockerfile : string =
2121
' -e ''s/#\(LoadModule .*mod_cgid.so\)/\1/'' \' + LineEnding +
2222
' -e ''s/^#\(LoadModule .*mod_rewrite.so\)/\1/'' \' + LineEnding +
2323
' -e ''s/^#\(Include .*httpd-vhosts.conf\)/\1/'' \' + LineEnding +
24-
' -e ''s/^#ServerName.*/ServerName 172.17.0.2/'' \' + LineEnding +
24+
' -e ''s/^#ServerName.*/ServerName fano-app/'' \' + LineEnding +
2525
' /usr/local/apache2/conf/httpd.conf' + LineEnding +
2626
'' + LineEnding +
2727
'#-----------------------------------' + LineEnding +

src/Tasks/Implementations/Project/FastCgi/Includes/httpd_dockerfile.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ strHttpdDockerfile : string =
2121
' -e ''s/^#\(LoadModule .*mod_proxy_fcgi.so\)/\1/'' \' + LineEnding +
2222
' -e ''s/^#\(LoadModule .*mod_rewrite.so\)/\1/'' \' + LineEnding +
2323
' -e ''s/^#\(Include .*httpd-vhosts.conf\)/\1/'' \' + LineEnding +
24-
' -e ''s/^#ServerName.*/ServerName 172.17.0.2/'' \' + LineEnding +
24+
' -e ''s/^#ServerName.*/ServerName fano-app/'' \' + LineEnding +
2525
' /usr/local/apache2/conf/httpd.conf && \' + LineEnding +
2626
' rm /usr/local/apache2/htdocs/index.html' + LineEnding +
2727
'' + LineEnding +

src/Tasks/Implementations/Project/Fcgid/CreateFcgidDockerfileTaskImpl.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ implementation
5757

5858
procedure TCreateFcgidDockerfileTask.createDockercomposeFile(const dir : string);
5959
var
60-
{$INCLUDE src/Tasks/Implementations/Project/Fcgif/Includes/dockercompose.inc}
60+
{$INCLUDE src/Tasks/Implementations/Project/Fcgid/Includes/dockercompose.inc}
6161
begin
6262
createTextFile(dir + '/docker-compose.yaml', strDockercompose);
6363
end;

src/Tasks/Implementations/Project/Fcgid/Includes/dockerfile.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ strDockerfile : string =
2727
' -e ''s/^#\(LoadModule .*mod_rewrite.so\)/\1/'' \' + LineEnding +
2828
' -e ''s/^#\(Include .*httpd-vhosts.conf\)/\1/'' \' + LineEnding +
2929
' -e ''/LoadModule .*mod_rewrite.so/a LoadModule fcgid_module /usr/lib/apache2/modules/mod_fcgid.so'' \' + LineEnding +
30-
' -e ''s/^#ServerName.*/ServerName 172.17.0.2/'' \' + LineEnding +
30+
' -e ''s/^#ServerName.*/ServerName fano-app/'' \' + LineEnding +
3131
' /usr/local/apache2/conf/httpd.conf' + LineEnding +
3232
'' + LineEnding +
3333
'#-----------------------------------' + LineEnding +

src/Tasks/Implementations/Project/Scgi/Includes/httpd_dockerfile.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ strHttpdDockerfile : string =
2121
' -e ''s/^#\(LoadModule .*mod_proxy_scgi.so\)/\1/'' \' + LineEnding +
2222
' -e ''s/^#\(LoadModule .*mod_rewrite.so\)/\1/'' \' + LineEnding +
2323
' -e ''s/^#\(Include .*httpd-vhosts.conf\)/\1/'' \' + LineEnding +
24-
' -e ''s/^#ServerName.*/ServerName 172.17.0.2/'' \' + LineEnding +
24+
' -e ''s/^#ServerName.*/ServerName fano-app/'' \' + LineEnding +
2525
' /usr/local/apache2/conf/httpd.conf && \' + LineEnding +
2626
' rm /usr/local/apache2/htdocs/index.html' + LineEnding +
2727
'' + LineEnding +

src/Tasks/Implementations/Project/Uwsgi/Includes/httpd_dockerfile.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ strHttpdDockerfile : string =
2121
' -e ''s/^#\(LoadModule .*mod_proxy_uwsgi.so\)/\1/'' \' + LineEnding +
2222
' -e ''s/^#\(LoadModule .*mod_rewrite.so\)/\1/'' \' + LineEnding +
2323
' -e ''s/^#\(Include .*httpd-vhosts.conf\)/\1/'' \' + LineEnding +
24-
' -e ''s/^#ServerName.*/ServerName 172.17.0.2/'' \' + LineEnding +
24+
' -e ''s/^#ServerName.*/ServerName fano-app/'' \' + LineEnding +
2525
' /usr/local/apache2/conf/httpd.conf && \' + LineEnding +
2626
' rm /usr/local/apache2/htdocs/index.html' + LineEnding +
2727
'' + LineEnding +

0 commit comments

Comments
 (0)