diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release.yml index e2b40bef..da4472e6 100644 --- a/.github/workflows/on-release.yml +++ b/.github/workflows/on-release.yml @@ -16,8 +16,8 @@ on: env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} - IS_RELEASE: ${{ github.event.pull_request.merged }} - # IS_RELEASE: True + # IS_RELEASE: ${{ github.event.pull_request.merged }} + IS_RELEASE: True DJANGO_SUFFIX: -django FRONTEND_SUFFIX: -frontend NGINX_SUFFIX: -nginx @@ -41,6 +41,7 @@ jobs: echo "NGINX_SUFFIX: ${{ env.NGINX_SUFFIX }}" echo "PSQL_SUFFIX: ${{ env.PSQL_SUFFIX }}" echo "PULL_REQUEST_MERGED: ${{ github.event.pull_request.merged }}" + build-and-push-image-django: runs-on: ubuntu-latest # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job. diff --git a/frontend/src/components/api/instance.js b/frontend/src/components/api/instance.js index b2756be6..2959abfa 100644 --- a/frontend/src/components/api/instance.js +++ b/frontend/src/components/api/instance.js @@ -10,7 +10,7 @@ import axios from 'axios' const Instance = axios.create({ - baseURL: 'http://homelab.kerasi.ru/api/v1', + baseURL: 'http://django:8000/api/v1', timeout: 5000, headers: { 'Content-Type': 'application/json', diff --git a/frontend/src/components/main-page/Garden/SearchBlock/SearchBlock.js b/frontend/src/components/main-page/Garden/SearchBlock/SearchBlock.js index 0899c182..7e41fb15 100644 --- a/frontend/src/components/main-page/Garden/SearchBlock/SearchBlock.js +++ b/frontend/src/components/main-page/Garden/SearchBlock/SearchBlock.js @@ -22,7 +22,7 @@ export default function SearchBlock({ onSelectItem }) { const fetchData = async () => { try { setLoading(true); - const response = await Instance.get('/garder/?format=json') + const response = await Instance.get('/garden/?format=json') setData(response.data); } catch (err) { setError(err);