Merge branch 'develop' into feature/ads-banner

This commit is contained in:
Viktor Fomin 2024-02-20 12:09:16 +03:00
commit 299dc15803
4 changed files with 7 additions and 6 deletions

View File

@ -57,9 +57,9 @@ jobs:
if [ "${{ matrix.branch }}" = "develop" ]; then
PRODUCT_VERSION="develop"
DOCKER_TAG=${PRODUCT_VERSION}.${{ github.run_number }}
else
else
PRODUCT_VERSION=$(echo "${{ matrix.branch }}" | sed '/^release\b\|^hotfix\b\|^feature\b/s/release.*\/\|hotfix.*\/\|feature.*\///; s/-git-action$//; s/^v//')
DOCKER_TAG=${PRODUCT_VERSION}.${{github.run_number}}
DOCKER_TAG=${PRODUCT_VERSION}.${{github.run_number}}
fi
export DOCKER_TAG
docker buildx bake -f build.yml \
@ -67,6 +67,8 @@ jobs:
--set *.args.PRODUCT_VERSION=${PRODUCT_VERSION} \
--set *.args.BUILD_NUMBER=${BUILD_NUMBER} \
--set *.platform=linux/amd64 \
--set *.args.PRODUCT_VERSION=${PRODUCT_VERSION} \
--set *.args.BUILD_NUMBER=${BUILD_NUMBER} \
--push
echo "version=${DOCKER_TAG}" >> "$GITHUB_OUTPUT"

View File

@ -72,7 +72,6 @@
"docusign",
"google",
"onedrive",
"sharepoint",
"nextcloud",
"owncloud",
"webdav",
@ -371,7 +370,7 @@
"api": "api/2.0",
"alias": {
"min": 3,
"max": 100
"max": 63
},
"api-system": "",
"api-cache": "",

View File

@ -278,7 +278,7 @@ server {
proxy_pass http://127.0.0.1:5007;
}
location ~* /(people|group) {
location ~* /(people|group|accounts) {
proxy_pass http://127.0.0.1:5004;
}

View File

@ -99,7 +99,7 @@ ${package_manager} -y install $([ $DIST != "fedora" ] && echo "epel-release") \
nodejs ${NODEJS_OPTION} \
dotnet-sdk-8.0 \
elasticsearch-${ELASTIC_VERSION} --enablerepo=elasticsearch \
mysql-server \
mysql-community-server \
postgresql \
postgresql-server \
rabbitmq-server$rabbitmq_version \