From a31db4b531cc6d9d58934e05d55f8c912baa1eb8 Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Mon, 29 Jan 2024 10:37:13 +0100 Subject: [PATCH 1/3] Remove references to packages deleted --- dockerfiles/celotool/Dockerfile | 2 -- dockerfiles/metadata-crawler/Dockerfile | 2 -- 2 files changed, 4 deletions(-) diff --git a/dockerfiles/celotool/Dockerfile b/dockerfiles/celotool/Dockerfile index 683fc8703db..b48351b4661 100644 --- a/dockerfiles/celotool/Dockerfile +++ b/dockerfiles/celotool/Dockerfile @@ -24,7 +24,6 @@ COPY packages/celotool/package.json packages/celotool/ COPY packages/dev-utils/package.json packages/dev-utils/ COPY packages/env-tests/package.json packages/env-tests/package.json COPY packages/protocol/package.json packages/protocol/ -COPY packages/typescript/package.json packages/typescript/ COPY patches/ patches/ COPY scripts/ scripts/ # Makes build fail if it doesn't copy git, will be removed after build @@ -38,7 +37,6 @@ COPY packages/dev-utils packages/dev-utils/ COPY packages/env-tests packages/env-tests COPY packages/helm-charts packages/helm-charts COPY packages/protocol packages/protocol/ -COPY packages/typescript packages/typescript/ RUN yarn build diff --git a/dockerfiles/metadata-crawler/Dockerfile b/dockerfiles/metadata-crawler/Dockerfile index 3af71f4e853..abeb5cd14ee 100644 --- a/dockerfiles/metadata-crawler/Dockerfile +++ b/dockerfiles/metadata-crawler/Dockerfile @@ -15,8 +15,6 @@ RUN npm install -g typescript npm COPY lerna.json package.json yarn.lock ./ COPY scripts scripts/ -COPY packages/typescript packages/typescript/ -COPY packages/sdk packages/sdk/ COPY packages/dev-utils packages/dev-utils/ COPY packages/metadata-crawler packages/metadata-crawler/ From f5ca5db806648fabde68dcf2dfaa17345aec055d Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Mon, 29 Jan 2024 10:37:35 +0100 Subject: [PATCH 2/3] Remove circleci dockerfiles and workflow --- .github/workflows/container-circleci.yml | 96 ------------------- dockerfiles/circleci/.dockerignore | 1 - dockerfiles/circleci/Dockerfile | 42 -------- .../circleci/circleci-node18/Dockerfile | 25 ----- dockerfiles/circleci/node10-gcloud/Dockerfile | 19 ---- 5 files changed, 183 deletions(-) delete mode 100644 .github/workflows/container-circleci.yml delete mode 100644 dockerfiles/circleci/.dockerignore delete mode 100644 dockerfiles/circleci/Dockerfile delete mode 100644 dockerfiles/circleci/circleci-node18/Dockerfile delete mode 100644 dockerfiles/circleci/node10-gcloud/Dockerfile diff --git a/.github/workflows/container-circleci.yml b/.github/workflows/container-circleci.yml deleted file mode 100644 index 63afcbec128..00000000000 --- a/.github/workflows/container-circleci.yml +++ /dev/null @@ -1,96 +0,0 @@ ---- -name: Build CircleCI related containers - -on: - push: - paths: - - 'dockerfiles/circleci/**' - branches: - - master - pull_request: - paths: - - 'dockerfiles/circleci/**' - workflow_dispatch: - -jobs: - changes: - runs-on: ubuntu-latest - outputs: - geth: ${{ steps.changes.outputs.geth }} - node12: ${{ steps.changes.outputs.node12 }} - gcloud: ${{ steps.changes.outputs.gcloud }} - steps: - - uses: actions/checkout@v4 - - name: Check for changes - uses: dorny/paths-filter@v2 - id: changes - with: - filters: | - geth: - - dockerfiles/circleci/Dockerfile - - dockerfiles/circleci/.dockerignore - node12: - - dockerfiles/circleci/circleci-node12/Dockerfile - gcloud: - - dockerfiles/circleci/node10-gcloud/Dockerfile - - geth-build-dev: - uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.8 - name: Build us-west1-docker.pkg.dev/devopsre/dev-images/circleci-geth:testing - needs: changes - if: | - needs.changes.outputs.geth == 'true' && - github.ref != 'refs/heads/master' - with: - workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-celo-monorepo/providers/github-by-repos - service-account: 'celo-monorepo-dev@devopsre.iam.gserviceaccount.com' - artifact-registry: us-west1-docker.pkg.dev/devopsre/dev-images/circleci-geth - tag: testing - context: dockerfiles/circleci - trivy: true - - geth-build: - uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.8 - name: Build us-west1-docker.pkg.dev/devopsre/celo-monorepo/circleci-geth:latest - needs: changes - if: | - needs.changes.outputs.geth == 'true' && - github.ref == 'refs/heads/master' - with: - workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-celo-monorepo-master/providers/github-by-repos - service-account: 'celo-monorepo@devopsre.iam.gserviceaccount.com' - artifact-registry: us-west1-docker.pkg.dev/devopsre/celo-monorepo/circleci-geth - tag: latest - context: dockerfiles/circleci - trivy: true - - node12-build-dev: - uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.8 - name: Build us-west1-docker.pkg.dev/devopsre/dev-images/circleci-node12:testing - needs: changes - if: | - needs.changes.outputs.node12 == 'true' && - github.ref != 'refs/heads/master' - with: - workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-celo-monorepo/providers/github-by-repos - service-account: 'celo-monorepo-dev@devopsre.iam.gserviceaccount.com' - artifact-registry: us-west1-docker.pkg.dev/devopsre/dev-images/circleci-node12 - tag: testing - context: dockerfiles/circleci - trivy: true - - node12-build: - uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.8 - name: Build us-west1-docker.pkg.dev/devopsre/celo-monorepo/circleci-node12:latest - needs: changes - if: | - needs.changes.outputs.node12 == 'true' && - github.ref == 'refs/heads/master' - with: - workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-celo-monorepo-master/providers/github-by-repos - service-account: 'celo-monorepo@devopsre.iam.gserviceaccount.com' - artifact-registry: us-west1-docker.pkg.dev/devopsre/celo-monorepo/circleci-node12 - tag: latest - context: dockerfiles/circleci - trivy: true - diff --git a/dockerfiles/circleci/.dockerignore b/dockerfiles/circleci/.dockerignore deleted file mode 100644 index 1d085cacc9f..00000000000 --- a/dockerfiles/circleci/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -** diff --git a/dockerfiles/circleci/Dockerfile b/dockerfiles/circleci/Dockerfile deleted file mode 100644 index 38f47647793..00000000000 --- a/dockerfiles/circleci/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -FROM cimg/node:12.13 -LABEL org.opencontainers.image.authors="devops@clabs.co" - -RUN sudo apt-get update -y && \ - sudo apt-get install -y lsb-release libudev-dev libusb-dev libusb-1.0-0 - -# Install Kubernetes, as per https://kubernetes.io/docs/tasks/tools/install-kubectl/ -RUN sudo apt-get install -y apt-transport-https && \ - curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - && \ - echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee -a /etc/apt/sources.list.d/kubernetes.list && \ - sudo apt-get update && \ - sudo apt-get install -y kubectl - -RUN sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 467B942D3A79BD29 && \ - sudo apt-get update && \ - sudo apt-get install -y apt-transport-https ca-certificates curl gnupg && \ - echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | \ - sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \ - curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \ - sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && \ - sudo apt-get update -y && \ - sudo apt-get install google-cloud-cli -y - -RUN sudo wget https://dl.google.com/go/go1.16.15.linux-amd64.tar.gz && \ - sudo tar xf go1.16.15.linux-amd64.tar.gz -C /usr/local && \ - sudo rm go1.16.15.linux-amd64.tar.gz - -RUN curl https://sh.rustup.rs -sSf | sh -s -- -y - -ENV PATH="/usr/local/go/bin:/home/circleci/.cargo/bin:${PATH}" - -RUN go version - -RUN rustup install 1.41.0 && \ - rustup default 1.41.0 - -RUN sudo apt-get clean -y && \ - sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -RUN mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config - -CMD ["/bin/sh"] diff --git a/dockerfiles/circleci/circleci-node18/Dockerfile b/dockerfiles/circleci/circleci-node18/Dockerfile deleted file mode 100644 index c8ee052186e..00000000000 --- a/dockerfiles/circleci/circleci-node18/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM cimg/node:18.14.2 - -RUN sudo apt-get update -y -RUN sudo apt-get install lsb-release libudev-dev libusb-dev libusb-1.0-0 rsync -y - -# Install python3 and python2 -RUN sudo apt-get update -y && \ - sudo apt-get install -y python3 python2 && \ - # Set python3 as default - sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \ - sudo apt-get clean -y && \ - sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -# Install Kubernetes, as per https://kubernetes.io/docs/tasks/tools/install-kubectl/ -RUN sudo apt-get install -y apt-transport-https && \ - curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - && \ - echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee -a /etc/apt/sources.list.d/kubernetes.list && \ - sudo apt-get update && \ - sudo apt-get install -y kubectl - -RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \ - curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && \ - sudo apt-get update && sudo apt-get install google-cloud-cli - -CMD ["/bin/sh"] diff --git a/dockerfiles/circleci/node10-gcloud/Dockerfile b/dockerfiles/circleci/node10-gcloud/Dockerfile deleted file mode 100644 index cab2e5c1c0d..00000000000 --- a/dockerfiles/circleci/node10-gcloud/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM circleci/node:10 -MAINTAINER Gaston Ponti - -RUN sudo apt-get update -y -RUN sudo apt-get install lsb-release libudev-dev libusb-dev libusb-1.0-0 rsync -y - -# Install Kubernetes, as per https://kubernetes.io/docs/tasks/tools/install-kubectl/ -RUN sudo apt-get install -y apt-transport-https && \ - curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - && \ - echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee -a /etc/apt/sources.list.d/kubernetes.list && \ - sudo apt-get update && \ - sudo apt-get install -y kubectl - -RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \ - echo "deb http://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \ - curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - && \ - sudo apt-get update -y && sudo apt-get install google-cloud-sdk -y - -CMD ["/bin/sh"] \ No newline at end of file From 51d03337af0550d64a45f309eb1674187bd09dae Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Mon, 29 Jan 2024 10:43:05 +0100 Subject: [PATCH 3/3] Delete reference to patches folder --- dockerfiles/celotool/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/dockerfiles/celotool/Dockerfile b/dockerfiles/celotool/Dockerfile index b48351b4661..4cc563608df 100644 --- a/dockerfiles/celotool/Dockerfile +++ b/dockerfiles/celotool/Dockerfile @@ -24,7 +24,6 @@ COPY packages/celotool/package.json packages/celotool/ COPY packages/dev-utils/package.json packages/dev-utils/ COPY packages/env-tests/package.json packages/env-tests/package.json COPY packages/protocol/package.json packages/protocol/ -COPY patches/ patches/ COPY scripts/ scripts/ # Makes build fail if it doesn't copy git, will be removed after build COPY .git .git