From 060c1d3a4f92061e4a976e4feb6e7b81f9d73ee4 Mon Sep 17 00:00:00 2001 From: Xabier <146219902+snthtcs@users.noreply.github.com> Date: Wed, 25 Oct 2023 12:53:12 +0200 Subject: [PATCH] Merge yarn4 fix into @carlos-kryha hotfix branch (#75) Co-authored-by: carlos-kryha <97608823+carlos-kryha@users.noreply.github.com> Co-authored-by: Xabier Almazor --- azure-pipelines-emerynet.yml | 43 ------------------------------------ frontend/Dockerfile.ui | 1 - 2 files changed, 44 deletions(-) delete mode 100644 azure-pipelines-emerynet.yml diff --git a/azure-pipelines-emerynet.yml b/azure-pipelines-emerynet.yml deleted file mode 100644 index 356a4def9..000000000 --- a/azure-pipelines-emerynet.yml +++ /dev/null @@ -1,43 +0,0 @@ -trigger: - - develop - -pool: - vmImage: "ubuntu-latest" - -stages: - - stage: build_and_deploy - displayName: Build and Deploy - dependsOn: [] - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - jobs: - - job: build_and_deploy - displayName: Build Docker images and deploy through Kubernetes - steps: - - script: curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/latest/skaffold-linux-amd64 && sudo install skaffold /usr/local/bin/ - displayName: Install Skaffold - - task: Docker@2 - displayName: Login to Container Registry - inputs: - command: login - containerRegistry: $(CONTAINER_REGISTRY_SERVICE_CONNECTION) - - task: DownloadSecureFile@1 - name: authkey - displayName: "Download Service Account Key" - inputs: - secureFile: web3-agoric.json - retryCount: "2" - - script: gcloud auth activate-service-account web3-agoric-0@web3-335312.iam.gserviceaccount.com --key-file=$(authkey.secureFilePath) - displayName: Activate Service Account - - task: Kubernetes@1 - inputs: - connectionType: "Kubernetes Service Connection" - kubernetesServiceEndpoint: "gke-service-connection" - namespace: "agoric-makefile-automation" - command: "login" - - script: | - cd frontend - export $(grep -v '^#' .env.emerynet | xargs) - envsubst < ../deployment/emerynet/workloads/config/ui-config.template.yaml > ../deployment/emerynet/workloads/config/ui-config.yaml - envsubst < skaffold.emerynet.template.yaml > skaffold.emerynet.yaml - skaffold run --filename skaffold.emerynet.yaml - displayName: Build and push docker images diff --git a/frontend/Dockerfile.ui b/frontend/Dockerfile.ui index 72c8a655e..969b9c37e 100644 --- a/frontend/Dockerfile.ui +++ b/frontend/Dockerfile.ui @@ -25,7 +25,6 @@ ENV VITE_NETWORK_CONFIG $VITE_NETWORK_CONFIG COPY .yarnrc.yml ./.yarnrc.yml COPY yarn.lock ./yarn.lock -COPY .yarn/ ./.yarn/ COPY .eslintrc.json ./.eslintrc.json COPY .eslintignore ./.eslintignore