diff --git a/.github/workflows/ci-cd-production.yml b/.github/workflows/ci-cd-production.yml index d8e7c3126d67..62f9239e6bf0 100644 --- a/.github/workflows/ci-cd-production.yml +++ b/.github/workflows/ci-cd-production.yml @@ -31,7 +31,6 @@ jobs: context: . # required to respect .dockerignore cache-from: type=registry,ref=${{ env.BASE_IMAGE }}:latest cache-to: type=inline - secrets: npmrc=//registry.npmjs.org/:_authToken=${{ secrets.NPM_SECRET_TOKEN }} tags: | ${{ env.BASE_IMAGE }}:${{ github.sha }} ${{ env.BASE_IMAGE }}:latest diff --git a/.github/workflows/ci-cd-pull-request.yml b/.github/workflows/ci-cd-pull-request.yml index 142cd5c753ae..13087055dedc 100644 --- a/.github/workflows/ci-cd-pull-request.yml +++ b/.github/workflows/ci-cd-pull-request.yml @@ -4,8 +4,6 @@ on: pull_request env: BASE_IMAGE: ghcr.io/graphprotocol/graph-docs-staging - HEALTH_CHECK_URL: https://staging.thegraph.com/docs - APP_NAME: graph-docs NEXT_PUBLIC_BASE_PATH: /docs jobs: @@ -15,22 +13,10 @@ jobs: - name: Checkout the repo uses: actions/checkout@v2 - - name: Login to GitHub Container Registry - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: nenadjaja - password: ${{ secrets.GH_ACCESS_TOKEN }} - - - name: Build and push Docker image + - name: Build Docker image uses: docker/build-push-action@v2 with: context: . # required to respect .dockerignore cache-from: type=registry,ref=${{ env.BASE_IMAGE }}:latest - cache-to: type=inline - secrets: npmrc=//registry.npmjs.org/:_authToken=${{ secrets.NPM_SECRET_TOKEN }} - tags: | - ${{ env.BASE_IMAGE }}:${{ github.sha }} - ${{ env.BASE_IMAGE }}:latest - push: true + push: false build-args: NEXT_PUBLIC_BASE_PATH=${{ env.NEXT_PUBLIC_BASE_PATH }} diff --git a/.github/workflows/ci-cd-staging.yml b/.github/workflows/ci-cd-staging.yml index c91525a1fe47..8789991c63d5 100644 --- a/.github/workflows/ci-cd-staging.yml +++ b/.github/workflows/ci-cd-staging.yml @@ -31,7 +31,6 @@ jobs: context: . # required to respect .dockerignore cache-from: type=registry,ref=${{ env.BASE_IMAGE }}:latest cache-to: type=inline - secrets: npmrc=//registry.npmjs.org/:_authToken=${{ secrets.NPM_SECRET_TOKEN }} tags: | ${{ env.BASE_IMAGE }}:${{ github.sha }} ${{ env.BASE_IMAGE }}:latest diff --git a/Dockerfile b/Dockerfile index 0bf813172a0b..0ed4f495f504 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,8 +11,7 @@ COPY ./package.json /app/package.json COPY ./yarn.lock /app/yarn.lock # install the packages -RUN --mount=type=secret,id=npmrc,dst=/root/.npmrc \ - yarn install +RUN yarn install # copy the rest COPY . .