From 8bb64c54aea45fdd8254955bfd6e1d1aad85f161 Mon Sep 17 00:00:00 2001 From: kevkevin Date: Tue, 1 Aug 2023 17:24:36 -0500 Subject: [PATCH] adding back the rm package-lock.json and arm64 (#740) * added back linux/arm64 * added back linux/arm64/v8 * added yarn in dockerfile * added yarn in dockerfile * added yarn in dockerfile * Lint and format code * Update proto files and types --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/workflows/docker-build.yml | 4 ++-- Dockerfile | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 1e8ecc8c6..96888d572 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -51,7 +51,7 @@ jobs: docker buildx build \ --cache-from "type=local,src=/tmp/.buildx-cache" \ --cache-to "type=local,dest=/tmp/.buildx-cache" \ - --platform linux/amd64,linux/arm/v7 \ + --platform linux/amd64,linux/arm64/v8,linux/arm/v7 \ --tag "${{ secrets.DOCKER_HUB_USER }}/sphinx-relay:${{ env.RELEASE_TAG }}" \ --output "type=registry" ./ - name: Run Docker buildx with latest tag @@ -59,6 +59,6 @@ jobs: docker buildx build \ --cache-from "type=local,src=/tmp/.buildx-cache" \ --cache-to "type=local,dest=/tmp/.buildx-cache" \ - --platform linux/amd64,linux/arm/v7 \ + --platform linux/amd64,linux/arm64/v8,linux/arm/v7 \ --tag "${{ secrets.DOCKER_HUB_USER }}/sphinx-relay:latest" \ --output "type=registry" ./ diff --git a/Dockerfile b/Dockerfile index 9d0d70726..c47cb4cc0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,8 @@ RUN which python3 RUN apt install -y g++ gcc libmcrypt-dev RUN apt-get -y install git +RUN rm ./package-lock.json + RUN npm install RUN cp /relay/config/app.json /relay/dist/config/app.json