diff --git a/.env b/.env index 235b6a4..9a9ce33 100644 --- a/.env +++ b/.env @@ -3,10 +3,10 @@ NETWORK=spottorg FRONT_TAG=develop DOTDOT_TAG=develop -LMS_TAG=develop +LMS_TAG=DD-4042-STORY ADMIN_TAG=master LANDING_TAG=master -CABINET_TAG=develop +CABINET_TAG=DD-4159 MYSQL_PORT=0.0.0.0:33063 MYSQL_ROOT_PASSWORD=root diff --git a/configs/cabinet/entrypoint.sh b/configs/cabinet/entrypoint.sh index dce9e53..386bc9e 100755 --- a/configs/cabinet/entrypoint.sh +++ b/configs/cabinet/entrypoint.sh @@ -1,19 +1,15 @@ #!/bin/sh DOMAIN="${DOMAIN:-lmscabinet.dot-dot.ru}" -# API_URL='"API_URL": "https://dot-dot.ru/"' -# d='https://dot-dot.ru/' for x in $(grep -lrw "lmscabinet.dot-dot.ru" .nuxt/);do echo "replace lmscabinet.dot-dot.ru to https://${DOMAIN} in $x" sed -i "s|lmscabinet.dot-dot.ru|${DOMAIN}|g" $x; done -for x in $(grep -lrw "https://dot-dot.ru" .nuxt/);do - echo "replace https://dot-dot.ru to ${API_URL} in $x" - sed -i "s|https://dot-dot.ru|${API_URL}|g" $x; - # echo "fix double //"; - # sed -i "s|\/\/\|/|g" $x; +for x in $(grep -lrw "https://dot-dot.ru/" .nuxt/);do + echo "replace https://dot-dot.ru to ${API_URL} in $x"; + sed -i "s|https://dot-dot.ru/|${API_URL}|g" $x; done "$@" diff --git a/configs/nginx/conf.d/demo.conf b/configs/nginx/conf.d/demo.conf index 827bd9d..8ae31dc 100755 --- a/configs/nginx/conf.d/demo.conf +++ b/configs/nginx/conf.d/demo.conf @@ -95,6 +95,10 @@ server { # expires 6M; } + location /css { + proxy_pass http://static; + } + location /robots.txt { proxy_pass http://static; }