From d2166322210e74c110a1c745496e7e66d4601ab5 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Wed, 5 Feb 2025 20:03:52 +0100 Subject: [PATCH] Remove unused files and return arm64 support --- .circleci/docker.yml | 34 ---------------------------- .circleci/local_config.yml | 32 -------------------------- .github/workflows/build_and_push.yml | 2 +- 3 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 .circleci/docker.yml delete mode 100644 .circleci/local_config.yml diff --git a/.circleci/docker.yml b/.circleci/docker.yml deleted file mode 100644 index 5d9a5804..00000000 --- a/.circleci/docker.yml +++ /dev/null @@ -1,34 +0,0 @@ -version: 2.1 - -jobs: - build-and-push: - docker: - - image: cimg/base:stable - steps: - - checkout - - setup_remote_docker - - run: - name: Login to DockerHub - command: | - echo "Attempting to login to DockerHub..." - echo "$DOCKERHUB_TOKEN" | sudo docker login -u "$DOCKERHUB_USERNAME" --password-stdin - - run: - name: Build and push Docker images - command: | - # Get the short SHA or use 'latest' as fallback - SHORT_SHA=${CIRCLE_SHA1:-rc1} - - sudo docker buildx create --use - sudo docker buildx build \ - --platform linux/amd64 \ - -t freikin/dawarich:${SHORT_SHA} \ - -t freikin/dawarich:rc \ - -f docker/Dockerfile.dev \ - --push . - -workflows: - version: 2 - build-and-push: - jobs: - - build-and-push: - context: dockerhub diff --git a/.circleci/local_config.yml b/.circleci/local_config.yml deleted file mode 100644 index e9c7f207..00000000 --- a/.circleci/local_config.yml +++ /dev/null @@ -1,32 +0,0 @@ -version: 2 -jobs: - build-and-push: - docker: - - image: cimg/base:stable - steps: - - checkout - - setup_remote_docker - - run: - name: Login to DockerHub - command: | - echo "Attempting to login to DockerHub..." - echo "$DOCKERHUB_TOKEN" | sudo docker login -u "$DOCKERHUB_USERNAME" --password-stdin - - run: - name: Build and push Docker images - command: | - # Get the short SHA or use 'latest' as fallback - SHORT_SHA=${CIRCLE_SHA1:-rc1} - - sudo docker buildx create --use - sudo docker buildx build \ - --platform linux/amd64 \ - -t freikin/dawarich:${SHORT_SHA} \ - -t freikin/dawarich:rc \ - -f docker/Dockerfile.dev \ - --push . -workflows: - version: 2 - build-and-push: - jobs: - - build-and-push: - context: dockerhub diff --git a/.github/workflows/build_and_push.yml b/.github/workflows/build_and_push.yml index 7269311a..cec9369f 100644 --- a/.github/workflows/build_and_push.yml +++ b/.github/workflows/build_and_push.yml @@ -77,6 +77,6 @@ jobs: file: ./docker/Dockerfile.dev push: true tags: ${{ steps.docker_meta.outputs.tags }} - platforms: linux/amd64,linux/arm/v7,linux/arm/v6 + platforms: linux/amd64,linux/arm/v7,linux/arm/v6,linux/arm64 cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache