From cef1fba281a9f0acca8fa3d42df12ab6a62b4b3c Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 6 Sep 2022 13:23:53 +0200 Subject: [PATCH] finally?! --- .github/workflows/release-candidate.yml | 32 +++++++++++-------------- apps/api/src/lib/common.ts | 10 +++++--- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml index 52a0f0b17..51fbb0a66 100644 --- a/.github/workflows/release-candidate.yml +++ b/.github/workflows/release-candidate.yml @@ -74,21 +74,17 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Login to docker hub - if: success() - uses: actions-hub/docker/login@v1.0.3 - env: - DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Create manifest - uses: actions-hub/docker/cli@v1.0.3 - env: - DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} - - run: docker manifest create coollabsio/coolify:${{github.event.release.name}} --amend coollabsio/coolify:${{github.event.release.name}}-amd64 --amend coollabsio/coolify:${{github.event.release.name}}-arm64 - - name: Push manifest - uses: actions-hub/docker/cli@v1.0.3 - env: - DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} - - run: docker manifest push coollabsio/coolify:${{github.event.release.name}} + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Create & publish manifest + run: | + docker manifest create coollabsio/coolify:v3.9.1-rc.1 --amend coollabsio/coolify:v3.9.1-rc.1-amd64 --amend coollabsio/coolify:v3.9.1-rc.1-arm64 + docker manifest push coollabsio/coolify:v3.9.1-rc.1 + diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts index f1b7aabae..8144e41bf 100644 --- a/apps/api/src/lib/common.ts +++ b/apps/api/src/lib/common.ts @@ -974,9 +974,13 @@ export const createDirectories = async ({ }): Promise<{ workdir: string; repodir: string }> => { const repodir = `/tmp/build-sources/${repository}/`; const workdir = `/tmp/build-sources/${repository}/${buildId}`; - - await asyncExecShell(`mkdir -p ${workdir}`); - + try { + await fs.stat(workdir); + await asyncExecShell(`rm -fr ${workdir}`); + await asyncExecShell(`mkdir -p ${workdir}`); + } catch(error) { + await asyncExecShell(`mkdir -p ${workdir}`); + } return { workdir, repodir