From 73c038e06bdd8fb162d96b1ef215b7a1d3e12a92 Mon Sep 17 00:00:00 2001 From: lemmav Date: Wed, 12 Jul 2023 11:54:22 +0300 Subject: [PATCH] Add special tag for docker images --- .github/workflows/4testing-multi-build.yml | 5 ++--- build/install/docker/Dockerfile.arm | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 build/install/docker/Dockerfile.arm diff --git a/.github/workflows/4testing-multi-build.yml b/.github/workflows/4testing-multi-build.yml index 5cd1f1c830..d325050ab7 100644 --- a/.github/workflows/4testing-multi-build.yml +++ b/.github/workflows/4testing-multi-build.yml @@ -4,8 +4,7 @@ on: push: branches: - 'hotfix/v**' - - 'release/v**' - + - 'release/v**' env: DOCKER_PATH: "/build/install/docker" REPO: "onlyoffice" @@ -35,7 +34,7 @@ jobs: run: | cd .${DOCKER_PATH} TAG=${{github.run_number}} - export DOCKER_TAG=$(echo "${GITHUB_REF_NAME}" | sed '/^release\b\|^hotfix\b\|^feature\b/s/release.*\/\|hotfix.*\/\|feature.*\///') + export DOCKER_TAG=$(echo "${GITHUB_REF_NAME}" | sed '/^release\b\|^hotfix\b/s/release.*\/\|hotfix.*\///') docker buildx bake -f build.yml \ --set *.args.GIT_BRANCH=$GITHUB_REF_NAME \ diff --git a/build/install/docker/Dockerfile.arm b/build/install/docker/Dockerfile.arm deleted file mode 100644 index 1db4ef4d05..0000000000 --- a/build/install/docker/Dockerfile.arm +++ /dev/null @@ -1,4 +0,0 @@ -FROM mwader/static-ffmpeg AS ffmpeg -FROM ubuntu:20.04 AS base -COPY --from=ffmpeg /ffprobe /ffmpeg /usr/local/bin/ -ENTRYPOINT ["bash"] \ No newline at end of file