From e1f6f101143d0d974a70ce2cf5c8ce199951d269 Mon Sep 17 00:00:00 2001 From: Stephan D Date: Tue, 18 Nov 2025 00:35:55 +0100 Subject: [PATCH] health check fix --- .DS_Store | Bin 12292 -> 0 bytes api/fx/ingestor/.DS_Store | Bin 6148 -> 0 bytes api/notification/.DS_Store | Bin 6148 -> 0 bytes api/pkg/.DS_Store | Bin 6148 -> 0 bytes ci/prod/compose/bff.yml | 2 +- ci/scripts/common/bump_version.sh | 27 +++++++++++++++------------ 6 files changed, 16 insertions(+), 13 deletions(-) delete mode 100644 .DS_Store delete mode 100644 api/fx/ingestor/.DS_Store delete mode 100644 api/notification/.DS_Store delete mode 100644 api/pkg/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index db2565e8fb2fe6c788a2c2501f92b2c47a8d5f3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12292 zcmeHNU2GIp6uxKL(pkFD0a_@~fei}^*g|djDL=;Twg}~~*lp>y1lk8DKoR% z)`HoX_yVFaK4|=fCx3`Ms3HkDw<%3CK!$KA_=~zJb3QCvu)YJlSC=bB=??s z&%NjVoco>KbLI{q1fps6K|+=iLPSiIN!OFOYw$n7>DL@WjnvMy}5+N2b ziAyxh)d{_QhOYr%19y`K1Y8WY-$G0x=_U4f`_+?~frMctu*>DdfT25XP0bI|3=j$m zi>4HdfvF|IY12!k88c^<%`Bfed-m+IITdr~&7Uv#NV5`3@?f8BrA@WbGAui4q_yro zTUTQPN>Vrb;;uI2#`MRu9%*J?*H%s4H^yok9>6|jV+=OjW?R!tHeO3_ucNu~aple) zsnki@mSOC&9NpC|v$IPXYV+pXu$hz8^s?e&sHAjvF#PaaU z4Xr%~jg)B}*MP5q|E~tP%Xv-T<-8{5`O6*g&aUp@ zZGGsQJ>!m~Wu#N4(<9ADDn>GGD6ZCE7}QrrUcSRVEVm7~ zb{32TB$dxoA6zeYWOxh{khXE=L&0)6p0rXa+@cfUyau^Z-bbh1t~hSXfM(JqUEpnx zU|W~duh?44AUe9(?1@H9LRufVHt0#3qP@D98SXW)JK7%spU@Fjc=SKvqZ34Vs(;7|AqZU{xf z9HBy(D=ZSKglb`huvVxS)(abiokEKc7Zl-uUgfmmakk@|4_py7&&@#fE{lJ4Er}(48uOdMjmc2GHVPj zSeP@vF@xj=+Kxt}4T%A?U8&gX9bPP=(MUyJb?Gv!Zj+|)YGw5b5e-xlST$H#TNgkx zlnT6R^;)a~uLL)244^?ug5@@lK)r61hTtA=fa}2bd1CpaSlP z8pL=Mw!lt?@)!pF`=AH*LjqJtfe98ILcAY_Bk(w6;R!_hQ;7Fx;8}PPUV@hq^RL4j z@Ftvsw-NClz*+bZK7mi+Jbdn9|1u)~DqPP)^Nt*jIfdVEh333ayol)dN|?T2Qtpv} zeB6%iY*_BUDC4-g`(Bjcy2hP)9>V#e{oL1puK`~Jz6N{^OcD(g<2t?jlY7K9^LFFA zW$gO%p1;2w!*8BT=HLJMH}aG6MjjE(u$zbH39pR)>)-48+WM+c?YjDZa<|PsE185B z^5Y`GN%}{FC@aE*&r*8-zv=eh|FKSf=4-&$z`dyfC~S%~MR9N5-TH)G(!2H$ru~@c zL;GbpWg?h)*YT{4UBx5MyUAg^2zIA(Sx%W4*16cf_YuHk_#zKAMr{M9`n zVzh#dDQIgtclmsMu7E4x3b+D)PywFVVv9>f?_B{`z!msbK=y~oCRiFK#k_T}%U1y6 zoat=zr%}X_ypc7RhHi(SHQ8Al|tGzo5V;NbW47 diff --git a/api/notification/.DS_Store b/api/notification/.DS_Store deleted file mode 100644 index c82e4d967d28990c887ea6ba017654903b73915d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKO-sW-5Phpf3SN5jxWB;S$!jR_CL)M;wXId5O-Pe_e!6cy6hm{CDl;(iW@l%1 zHxIHO0MepcT>&!yQ>tJRXGA1C+I8Z|f=S1yu&Uda+iu@BBLf{{NY;La4Juq>OZ#*E z*LcJpYc#ZTYD>Sy8=kRayJYqf9jn%Cx0-X$+zKCzEIqQN*Dzbuhb=@ z;#WH2;Y#kD$-xSbk;Yh4Fc1s`1Hr%_Vt{A1$n@MWY%mZE1Owj;$o`P2f`wyms9Oh( zJ^_dmhE?dxTS98GW8v5vvWJqalxU^NpBTx?8PA?qIQE8Cj-)el9H05?@sf0Q#AV{a&2L!UO}qz`!S6Z84Yt diff --git a/api/pkg/.DS_Store b/api/pkg/.DS_Store deleted file mode 100644 index 1aa90dd38745402468a211e4eb99a4992b4db050..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~K?=e^3`G;|qTr@Wm$UHz-e3?tK`)>n=t3%px}Kx^lL>;=wTS#c@+X-IrEk$` zL_}A&{Zgb8krr+$3kxGt4X|{^>yQ5dhkt?1r_^63}D?Xbvq^QGsbp4;roN zV~Ewg9h%}?4lPw{yJ!p_8c$Z6VqjX^MH3R3W)}t$Ab}BqY0W#k|2ObY^Z%%YDG89k zpApbz-LF@8skmF;UeD^=sM@-~p?)0U_8}^eepgFWuMFqwm0mr~V0$(NY E0L2Ru#Q*>R diff --git a/ci/prod/compose/bff.yml b/ci/prod/compose/bff.yml index a50ad11..605f3da 100644 --- a/ci/prod/compose/bff.yml +++ b/ci/prod/compose/bff.yml @@ -43,7 +43,7 @@ services: ports: - "0.0.0.0:${BFF_HTTP_PORT}:8081" healthcheck: - test: ["CMD-SHELL","wget -qO- http://localhost:8081/health | grep -q '\"status\":\"ok\"'"] + test: ["CMD-SHELL","wget -qO- http://localhost:8081/api/v1/health | grep -q '\"status\":\"ok\"'"] interval: 30s timeout: 10s retries: 3 diff --git a/ci/scripts/common/bump_version.sh b/ci/scripts/common/bump_version.sh index d8c6c7b..b17d240 100755 --- a/ci/scripts/common/bump_version.sh +++ b/ci/scripts/common/bump_version.sh @@ -67,20 +67,23 @@ if [ -z "${BRANCH}" ] || [ "${BRANCH}" = "HEAD" ]; then BRANCH="$(git rev-parse --abbrev-ref HEAD)" fi -NETRC_MACHINE="${CI_NETRC_MACHINE:-${WOODPECKER_NETRC_MACHINE:-}}" -NETRC_USERNAME="${CI_NETRC_USERNAME:-${WOODPECKER_NETRC_USERNAME:-${CI_NETRC_LOGIN:-${WOODPECKER_NETRC_LOGIN:-}}}}" -NETRC_PASSWORD="${CI_NETRC_PASSWORD:-${WOODPECKER_NETRC_PASSWORD:-}}" +NETRC_MACHINE="${CI_NETRC_MACHINE:-${WOODPECKER_NETRC_MACHINE:-${DRONE_NETRC_MACHINE:-}}}" +NETRC_USERNAME="${CI_NETRC_USERNAME:-${WOODPECKER_NETRC_USERNAME:-${DRONE_NETRC_USERNAME:-${CI_NETRC_LOGIN:-${WOODPECKER_NETRC_LOGIN:-${DRONE_NETRC_LOGIN:-}}}}}}" +NETRC_PASSWORD="${CI_NETRC_PASSWORD:-${WOODPECKER_NETRC_PASSWORD:-${DRONE_NETRC_PASSWORD:-}}}" if [ -n "${NETRC_MACHINE}" ] && [ -n "${NETRC_USERNAME}" ] && [ -n "${NETRC_PASSWORD}" ]; then NETRC_FILE="${HOME:-/root}/.netrc" - if [ ! -f "${NETRC_FILE}" ]; then - { - printf 'machine %s\n' "${NETRC_MACHINE}" - printf 'login %s\n' "${NETRC_USERNAME}" - printf 'password %s\n' "${NETRC_PASSWORD}" - } > "${NETRC_FILE}" - chmod 600 "${NETRC_FILE}" - echo "[bump-version] wrote credentials for ${NETRC_MACHINE}" - fi + { + printf 'machine %s\n' "${NETRC_MACHINE}" + printf 'login %s\n' "${NETRC_USERNAME}" + printf 'password %s\n' "${NETRC_PASSWORD}" + } > "${NETRC_FILE}" + chmod 600 "${NETRC_FILE}" + echo "[bump-version] configured credentials for ${NETRC_MACHINE}" +fi + +REMOTE_URL="${CI_REPO_REMOTE:-${WOODPECKER_GIT_REMOTE:-${DRONE_REMOTE_URL:-}}}" +if [ -n "${REMOTE_URL}" ]; then + git remote set-url origin "${REMOTE_URL}" fi git push origin "HEAD:${BRANCH}"