Compare commits
3
Commits
118a30c84a
...
f38e3856ba
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f38e3856ba
|
||
|
|
6b9bbbecf3
|
||
|
|
4c529d690e
|
@@ -247,6 +247,28 @@ networks:
|
|||||||
|
|
||||||
The `teron-mock` service is reachable from `ntech` at `http://teron-mock:4566` over the internal Docker network — the port is not exposed to the host.
|
The `teron-mock` service is reachable from `ntech` at `http://teron-mock:4566` over the internal Docker network — the port is not exposed to the host.
|
||||||
|
|
||||||
|
To run as a standalone Docker container:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
# docker-compose.fisk.yml
|
||||||
|
services:
|
||||||
|
teron-mock:
|
||||||
|
image: ghcr.io/dalibor31/ntech-fisk:latest
|
||||||
|
container_name: teron_mock
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "4566:4566"
|
||||||
|
volumes:
|
||||||
|
- teron-data:/app/data
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
teron-data:
|
||||||
|
```
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose -f docker-compose.fisk.yml up -d
|
||||||
|
```
|
||||||
|
|
||||||
To run the mock server locally (without Docker):
|
To run the mock server locally (without Docker):
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
@@ -247,6 +247,28 @@ networks:
|
|||||||
|
|
||||||
Servis `teron-mock` je dostupan iz `ntech` kontejnera na adresi `http://teron-mock:4566` preko interne Docker mreže — port nije izložen spolja.
|
Servis `teron-mock` je dostupan iz `ntech` kontejnera na adresi `http://teron-mock:4566` preko interne Docker mreže — port nije izložen spolja.
|
||||||
|
|
||||||
|
Za pokretanje kao samostalni Docker kontejner:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
# docker-compose.fisk.yml
|
||||||
|
services:
|
||||||
|
teron-mock:
|
||||||
|
image: ghcr.io/dalibor31/ntech-fisk:latest
|
||||||
|
container_name: teron_mock
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "4566:4566"
|
||||||
|
volumes:
|
||||||
|
- teron-data:/app/data
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
teron-data:
|
||||||
|
```
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose -f docker-compose.fisk.yml up -d
|
||||||
|
```
|
||||||
|
|
||||||
Za lokalno pokretanje moka (bez Dockera):
|
Za lokalno pokretanje moka (bez Dockera):
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
@@ -18,6 +18,33 @@ VERZIJA="${VERZIJA:-$VERZIJA_DEFAULT}"
|
|||||||
if [ "$VERZIJA" != "$VERZIJA_DEFAULT" ]; then
|
if [ "$VERZIJA" != "$VERZIJA_DEFAULT" ]; then
|
||||||
echo "$VERZIJA" > "$VER_FAJL"
|
echo "$VERZIJA" > "$VER_FAJL"
|
||||||
echo " → VERSION ažuriran na: $VERZIJA"
|
echo " → VERSION ažuriran na: $VERZIJA"
|
||||||
|
|
||||||
|
# Git tag + GitHub release
|
||||||
|
TAG="v${VERZIJA}"
|
||||||
|
if git rev-parse "$TAG" >/dev/null 2>&1; then
|
||||||
|
echo " ⚠️ Tag $TAG već postoji — preskačem"
|
||||||
|
else
|
||||||
|
read -p " Napraviti git tag $TAG + GitHub release? [D/n]: " TAG_IZBOR
|
||||||
|
TAG_IZBOR="${TAG_IZBOR:-d}"
|
||||||
|
if [[ "$TAG_IZBOR" =~ ^[dDyY] ]]; then
|
||||||
|
git tag -a "$TAG" -m "Release $TAG"
|
||||||
|
git push origin "$TAG"
|
||||||
|
echo " → Tag $TAG push-ovan"
|
||||||
|
GITEA_REPO="dasko/ntech"
|
||||||
|
if command -v gh &>/dev/null && gh auth status &>/dev/null 2>&1; then
|
||||||
|
gh release create "$TAG" --generate-notes
|
||||||
|
echo " → GitHub release napravljen sa changelog-om"
|
||||||
|
else
|
||||||
|
echo " ⚠️ GitHub CLI (gh) nije dostupan — GitHub release nije napravljen"
|
||||||
|
fi
|
||||||
|
if command -v tea &>/dev/null && tea login status 2>/dev/null | grep -q "Logged in"; then
|
||||||
|
tea release create --repo "$GITEA_REPO" --tag "$TAG" --title "$TAG" --note "Release $TAG" --draft
|
||||||
|
echo " → Gitea release draft napravljen (proveri u Web UI)"
|
||||||
|
else
|
||||||
|
echo " ⚠️ Gitea CLI (tea) nije dostupan/ulogovan — Gitea release nije napravljen"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
@@ -148,11 +175,13 @@ if [[ "$BUILD_IZBOR" =~ ^[dDyY] ]]; then
|
|||||||
build_za "windows" "ntech.exe"
|
build_za "windows" "ntech.exe"
|
||||||
;;
|
;;
|
||||||
3)
|
3)
|
||||||
build_za "linux" "ntech" &
|
mkdir -p /tmp/ntech-build-linux /tmp/ntech-build-windows
|
||||||
|
(build_za "linux" "/tmp/ntech-build-linux/ntech" && cp /tmp/ntech-build-linux/ntech ntech) &
|
||||||
PID_LINUX=$!
|
PID_LINUX=$!
|
||||||
build_za "windows" "ntech.exe" &
|
(build_za "windows" "/tmp/ntech-build-windows/ntech.exe" && cp /tmp/ntech-build-windows/ntech.exe ntech.exe) &
|
||||||
PID_WIN=$!
|
PID_WIN=$!
|
||||||
wait $PID_LINUX $PID_WIN
|
wait $PID_LINUX $PID_WIN
|
||||||
|
rm -rf /tmp/ntech-build-linux /tmp/ntech-build-windows
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
build_za "linux" "ntech"
|
build_za "linux" "ntech"
|
||||||
|
|||||||
Reference in New Issue
Block a user