diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4452f2286..94e3ffe66 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -300,6 +300,14 @@ jobs: repository: ${{ github.repository }} client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "VERSION": "${VERSION}", "BUILD_DATE": "${BUILD_DATE}", "BUILD_COMMIT": "${BUILD_COMMIT}", "BUILD_VERSION": "${BUILD_VERSION}"}' + - name: Repository Dispatch stage.ocelot.social + uses: peter-evans/repository-dispatch@v2 + with: + token: ${{ github.token }} + event-type: trigger-build-success + repository: 'Ocelot-Social-Community/stage.ocelot.social' + client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "VERSION": "${VERSION}", "BUILD_DATE": "${BUILD_DATE}", "BUILD_COMMIT": "${BUILD_COMMIT}", "BUILD_VERSION": "${BUILD_VERSION}"}' + # ############################################################################## # # JOB: KUBERNETES DEPLOY ACTUAL/LATEST VERSION ###################################### # ############################################################################## diff --git a/deployment/scripts/cluster.upgrade.sh b/deployment/scripts/cluster.upgrade.sh index 2502a778a..1aec2cf18 100755 --- a/deployment/scripts/cluster.upgrade.sh +++ b/deployment/scripts/cluster.upgrade.sh @@ -7,7 +7,13 @@ SCRIPT_DIR=$(dirname $SCRIPT_PATH) # configuration CONFIGURATION=${CONFIGURATION:-"example"} KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml} -VALUES=${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubernetes/values.yaml +VALUES=${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubernetes/values. +DOCKERHUB_OCELOT_TAG=${DOCKERHUB_OCELOT_TAG:-"latest"} # upgrade with helm -helm --kubeconfig=${KUBECONFIG} upgrade ocelot --values ${VALUES} ${SCRIPT_DIR}/../src/kubernetes/ --debug --timeout 10m \ No newline at end of file +helm --kubeconfig=${KUBECONFIG} upgrade ocelot \ + --values ${VALUES} \ + --set appVersion="${DOCKERHUB_OCELOT_TAG}" + ${SCRIPT_DIR}/../src/kubernetes/ \ + --debug \ + --timeout 10m \ No newline at end of file diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue index 7618e5b57..dbde61ac6 100644 --- a/webapp/components/Group/GroupList.vue +++ b/webapp/components/Group/GroupList.vue @@ -1,9 +1,14 @@ + diff --git a/webapp/pages/groups.vue b/webapp/pages/groups.vue index 386905c5b..6b895de72 100644 --- a/webapp/pages/groups.vue +++ b/webapp/pages/groups.vue @@ -4,7 +4,7 @@ - + @@ -49,7 +49,7 @@ @next="nextResults" /> - + diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index bb6eff0f4..0094f5706 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -346,7 +346,7 @@ export default { position: fixed; z-index: 6; margin-top: -35px; - padding: 20px 10px 5px 10px; + padding: 20px 10px 20px 10px; background-color: #f5f4f6; } @media screen and (max-width: 656px) {