Skip to content

Commit c610ae1

Browse files
committed
Change domain of Titans demo site
1 parent d7d276e commit c610ae1

File tree

15 files changed

+10
-7
lines changed

15 files changed

+10
-7
lines changed

docker/nginx/m-hosts.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ map $http_host $PHP_HOSTM2 {
2626
hyva-m2-dev.local php81;
2727
phpmyadmin.local php82;
2828
docker-stack-ui.localhost php82;
29-
titans.localhost php81;
29+
titans.loc php81;
3030

3131
# DEFAULT - LEAVE AS LAST ENTRY IN MAP
3232
.loc php74;

docker/phpstorm-server/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ RUN usermod -u $USERID --home /var/www/htdocs/ www-data
99
RUN groupmod -g $GROUPID www-data
1010
RUN chown www-data: /var/www/
1111

12+
RUN echo "fs.inotify.max_user_watches=524288" >> /etc/sysctl.conf
13+
1214
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git curl unzip procps time mc strace git
1315
WORKDIR /tmp
1416
ARG IDEA_BUILD=223.8617.59

docker/vscode-server/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ RUN usermod -u $USERID --home /var/www/htdocs www-data
1212
RUN groupmod -g $GROUPID www-data
1313
RUN chown -R www-data: /var/www/htdocs
1414

15+
RUN echo "fs.inotify.max_user_watches=524288" >> /etc/sysctl.conf
16+
1517
RUN apt-get update \
1618
&& DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y \
1719
ca-certificates sudo curl dumb-init \
@@ -29,7 +31,6 @@ RUN ARCH="$(dpkg --print-architecture)" && wget https://github.com/cdr/code-serv
2931
RUN git config --global core.fileMode false
3032
RUN touch /var/www/htdocs/.bashrc && chown www-data: /var/www/htdocs/.bashrc && chsh -s /usr/bin/bash www-data
3133

32-
3334
ADD entrypoint.sh /usr/bin/entrypoint.sh
3435
RUN chmod +x /usr/bin/entrypoint.sh && \
3536
chown www-data: /usr/bin/entrypoint.sh

project/mage_titans

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ php_host='php81'; # 'php56', 'php70', 'php72', 'php73' or 'php74'
4040
required_containers=( "nginx" "rediscache" "redissession" "redisfullpage" "elasticsearch716" "gitea" "kibana" "${php_host}" "${db_host}");
4141
composer_version="2";
4242
db_name='mage_titans'; # unique name for this database
43-
vmhost_name='titans.localhost'; # domain name for this project in local vm.
44-
docker_compose_args='-f ./project/resources/titans.localhost/docker-compose-services.yml'
43+
vmhost_name='titans.loc'; # domain name for this project in local vm.
44+
docker_compose_args="-f ./project/resources/${vmhost_name}/docker-compose-services.yml"
4545

4646
###################
4747
# Bespoke functions
@@ -81,7 +81,7 @@ internal_setup_gitea () {
8181
internal_require_apm () {
8282
composer config repositories.cmtickle/module-elastic-apm vcs https://github.com/cmtickle/elastic-apm-magento.git;
8383
composer require --dev cmtickle/module-elastic-apm:dev-develop@dev;
84-
docker:copy ./project/resources/titans.localhost/apm.php ${php_host}:/var/www/htdocs/${vmhost_name}/app/etc/apm.php
84+
docker:copy ./project/resources/${vmhost_name}/apm.php ${php_host}:/var/www/htdocs/${vmhost_name}/app/etc/apm.php
8585
}
8686

8787
internal_show_gitea_info () {

project/resources/titans.localhost/configurator/Configuration/global.yaml renamed to project/resources/titans.loc/configurator/Configuration/global.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
global:
22
-
33
path: web/unsecure/base_url
4-
value: https://titans.localhost/
4+
value: https://titans.loc/
55
-
66
path: web/secure/base_url
7-
value: https://titans.localhost/
7+
value: https://titans.loc/
88
-
99
path: dev/static/sign
1010
value: 0

0 commit comments

Comments
 (0)