From 78173c9d1e3436fbdc6b2274635044ab88032a5a Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 12 Oct 2023 13:43:15 +0100 Subject: [PATCH] Some minor updates, attempting to maximise space to get build running again, having issues with network timeouts/buildx problems, attempting to restore full build. --- .github/workflows/release-singleimage.yml | 12 ------------ hosting/single/Dockerfile | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release-singleimage.yml b/.github/workflows/release-singleimage.yml index 78b5cdd577..61ab9a4eb2 100644 --- a/.github/workflows/release-singleimage.yml +++ b/.github/workflows/release-singleimage.yml @@ -33,14 +33,6 @@ jobs: with: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - fetch-depth: 0 - - - name: Fail if tag is not in master - run: | - if ! git merge-base --is-ancestor ${{ github.sha }} origin/master; then - echo "Tag is not in master. This pipeline can only execute tags that are present on the master branch" - exit 1 - fi - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v1 @@ -55,10 +47,6 @@ jobs: run: yarn - name: Update versions run: ./scripts/updateVersions.sh - - name: Runt Yarn Lint - run: yarn lint - - name: Update versions - run: ./scripts/updateVersions.sh - name: Run Yarn Build run: yarn build:docker:pre - name: Login to Docker Hub diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile index 9fdf2449d1..95e383edb0 100644 --- a/hosting/single/Dockerfile +++ b/hosting/single/Dockerfile @@ -12,14 +12,14 @@ RUN chmod +x /cleanup.sh WORKDIR /app ADD packages/server . COPY yarn.lock . -RUN yarn install --production=true +RUN yarn install --production=true --network-timeout 100000 RUN /cleanup.sh # build worker WORKDIR /worker ADD packages/worker . COPY yarn.lock . -RUN yarn install --production=true +RUN yarn install --production=true --network-timeout 100000 RUN /cleanup.sh FROM budibase/couchdb