Skip to content

Commit

Permalink
Merge pull request #69 from mikeiken:dev
Browse files Browse the repository at this point in the history
Update release workflow and fix API endpoints
  • Loading branch information
Kseen715 authored Oct 21, 2024
2 parents 333588c + ef0303d commit 802e225
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/api/instance.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 802e225

Please sign in to comment.