Skip to content

Commit

Permalink
Downgrade docker-compose for compatibility issue with docspace.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
evgeniy-antonyuk committed Nov 6, 2024
1 parent fbafcda commit 327c8ab
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/ci-oci-docker-install.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Install OneClickInstall Docker

on:
push:
branches:
- 'bugfix/oci-hotfix'
pull_request:
types: [opened, reopened, synchronize]
paths:
Expand All @@ -21,7 +24,7 @@ jobs:
- name: Determine Branch Name
run: |
BRANCH_NAME=$([ "${{ github.event_name }}" = "pull_request" ] && echo "${{ github.event.pull_request.head.ref }}" || echo "${GITHUB_REF#refs/heads/}")
echo "BRANCH_NAME=${BRANCH_NAME:-master}" >> $GITHUB_ENV
echo "BRANCH_NAME=${BRANCH_NAME:-bugfix/oci-hotfix}" >> $GITHUB_ENV
- name: Free Disk Space
run: |
Expand All @@ -32,7 +35,7 @@ jobs:
wget https://download.onlyoffice.com/docspace/docspace-enterprise-install.sh
sed '/bash install-Docker.sh/i sed -i "1i set -x" install-Docker.sh' -i docspace-enterprise-install.sh
sed '/bash install-Docker.sh/i sed -i "/docker-compose.*up -d/ s/$/ --quiet-pull/" install-Docker.sh' -i docspace-enterprise-install.sh
sudo bash docspace-enterprise-install.sh docker -docsi onlyoffice/documentserver-ee -skiphc true -noni true $([ ${{ env.BRANCH_NAME }} != "master" ] && echo "-gb ${{ env.BRANCH_NAME }} -s 4testing-") || exit $?
sudo bash docspace-enterprise-install.sh docker -docsi onlyoffice/documentserver-ee -skiphc true -noni true $([ ${{ env.BRANCH_NAME }} != "master" ] && echo "-gb ${{ env.BRANCH_NAME }}") || exit $?
echo -n "Waiting for all containers to start..."
timeout 300 bash -c 'while docker ps | grep -q "starting"; do sleep 5; done' && echo "OK" || echo "container_status=timeout" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion install/OneClickInstall/install-Docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ install_package () {
}

install_docker_compose () {
curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/bin/docker-compose
curl -L "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/bin/docker-compose
chmod +x /usr/bin/docker-compose
}

Expand Down

0 comments on commit 327c8ab

Please sign in to comment.