diff --git a/.yarnrc b/.yarnrc index e1a507d..0457d11 100644 --- a/.yarnrc +++ b/.yarnrc @@ -1 +1,2 @@ "@frontend:registry" "https://penahub.gitlab.yandexcloud.net/api/v4/packages/npm/" +"@frontend:registry" "https://penahub.gitlab.yandexcloud.net/api/v4/packages/npm/" diff --git a/Dockerfile b/Dockerfile index 3d23a8d..4c1df49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,12 @@ RUN apk update && rm -rf /var/cache/apk/* WORKDIR /usr/app COPY . . -RUN yarn install --ignore-scripts --non-interactive --frozen-lockfile && yarn cache clean +RUN npm config set -- //penahub.gitlab.yandexcloud.net/api/v4/packages/npm/:_authToken=glpat-JL_7wSM1QpW7xGfd-oWX +RUN npm config set -- //penahub.gitlab.yandexcloud.net/api/v4/projects/43/packages/npm/:_authToken=glpat-JL_7wSM1QpW7xGfd-oWX +RUN npm config set @frontend:registry https://penahub.gitlab.yandexcloud.net/api/v4/packages/npm/ +RUN yarn config set '//penahub.gitlab.yandexcloud.net/api/v4/packages/npm/:_authToken' "glpat-JL_7wSM1QpW7xGfd-oWX" +RUN yarn config set '//penahub.gitlab.yandexcloud.net/api/v4/projects/:_authToken' "glpat-JL_7wSM1QpW7xGfd-oWX" +RUN yarn install --verbose --ignore-scripts --non-interactive && yarn cache clean RUN yarn build diff --git a/admin.conf b/admin.conf index 9c17334..7efbea0 100644 --- a/admin.conf +++ b/admin.conf @@ -35,7 +35,7 @@ server { add_header Access-Control-Allow-Credentials true always; add_header Access-Control-Allow-Headers content-type,authorization,response-type always; add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; - proxy_pass http://10.8.0.9:1488/; + proxy_pass http://10.6.0.26:1488/; } location /user/ { if ($request_method = OPTIONS) { @@ -82,7 +82,7 @@ server { chunked_transfer_encoding off; proxy_buffering off; proxy_cache off; - proxy_pass https://10.8.0.8:1488/; + proxy_pass https://10.6.0.9:1488/; } location /heruvym/v1.0.0/ { @@ -97,7 +97,7 @@ server { chunked_transfer_encoding off; proxy_buffering off; proxy_cache off; - proxy_pass https://10.8.0.8:1487/; + proxy_pass https://10.6.0.9:1487/; } location /strator/ { @@ -127,7 +127,7 @@ server { add_header Access-Control-Allow-Credentials true always; add_header Access-Control-Allow-Headers content-type,authorization always; add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; - proxy_pass http://10.8.0.6:8070/; + proxy_pass http://10.6.0.9:8070/; } location /answer/ { @@ -142,7 +142,7 @@ server { add_header Access-Control-Allow-Credentials true always; add_header Access-Control-Allow-Headers content-type,authorization always; add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; - proxy_pass http://10.8.0.8:8066/; + proxy_pass http://10.6.0.26:8066/; } location /codeword/ { diff --git a/package.json b/package.json index f7e7550..1d64e01 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@date-io/dayjs": "^2.15.0", "@emotion/react": "^11.10.4", "@emotion/styled": "^11.10.4", - "@frontend/kitui": "^1.0.82", + "@frontend/kitui": "^1.0.86", "@material-ui/pickers": "^3.3.10", "@mui/icons-material": "^5.10.3", "@mui/material": "^5.10.5",