From 1bb4fe04f0e30e2123dbd51a2d3eefdbe44f7047 Mon Sep 17 00:00:00 2001 From: i-norden Date: Tue, 21 Mar 2023 12:49:12 -0500 Subject: [PATCH] fix after cherry-pick --- .github/workflows/issues-notion-sync.yml | 29 -------------- .github/workflows/publish.yaml | 50 +++++++++++++----------- Dockerfile | 2 +- 3 files changed, 28 insertions(+), 53 deletions(-) delete mode 100644 .github/workflows/issues-notion-sync.yml diff --git a/.github/workflows/issues-notion-sync.yml b/.github/workflows/issues-notion-sync.yml deleted file mode 100644 index 551362b..0000000 --- a/.github/workflows/issues-notion-sync.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Notion Sync - -on: - workflow_dispatch: - issues: - types: - [ - opened, - edited, - labeled, - unlabeled, - assigned, - unassigned, - milestoned, - demilestoned, - reopened, - closed, - ] - -jobs: - notion_job: - runs-on: ubuntu-latest - name: Add GitHub Issues to Notion - steps: - - name: Add GitHub Issues to Notion - uses: vulcanize/notion-github-action@v1.2.4-issueid - with: - notion-token: ${{ secrets.NOTION_TOKEN }} - notion-db: ${{ secrets.NOTION_DATABASE }} diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index bad2a7b..94ac141 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -10,7 +10,9 @@ jobs: - uses: actions/checkout@v2 - name: Get the version id: vars - run: echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7}) + run: | + echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7}) + echo ::set-output name=tag::$(echo ${GITHUB_REF#refs/tags/}) - name: Run docker build run: make docker-build - name: Tag docker image @@ -18,26 +20,28 @@ jobs: - name: Tag docker image run: docker tag git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:${{steps.vars.outputs.sha}} git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:${{steps.vars.outputs.tag}} - name: Docker Login - run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u vulcanize --password-stdin + run: echo ${{ secrets.GITEA_TOKEN }} | docker login https://git.vdb.to -u cerccicd --password-stdin - name: Docker Push - run: docker push docker.pkg.github.com/vulcanize/ipld-eth-db/ipld-eth-db:${{steps.vars.outputs.sha}} - push_to_registries: - name: Push Docker image to Docker Hub - runs-on: ubuntu-latest - needs: build - steps: - - name: Get the version - id: vars - run: | - echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7}) - echo ::set-output name=tag::$(echo ${GITHUB_REF#refs/tags/}) - - name: Docker Login to Github Registry - run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u vulcanize --password-stdin - - name: Docker Pull - run: docker pull docker.pkg.github.com/vulcanize/ipld-eth-db/ipld-eth-db:${{steps.vars.outputs.sha}} - - name: Docker Login to Docker Registry - run: echo ${{ secrets.VULCANIZEJENKINS_PAT }} | docker login -u vulcanizejenkins --password-stdin - - name: Tag docker image - run: docker tag docker.pkg.github.com/vulcanize/ipld-eth-db/ipld-eth-db:${{steps.vars.outputs.sha}} vulcanize/ipld-eth-db:${{steps.vars.outputs.tag}} - - name: Docker Push to Docker Hub - run: docker push vulcanize/ipld-eth-db:${{steps.vars.outputs.tag}} + run: docker push git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:${{steps.vars.outputs.sha}} + - name: Docker Push with TAG to git.vdb.to + run: docker push git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:${{steps.vars.outputs.tag}} + #push_to_registries: + # name: Push Docker image to Docker Hub + # runs-on: ubuntu-latest + # needs: build + # steps: + # - name: Get the version + # id: vars + # run: | + # echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7}) + # echo ::set-output name=tag::$(echo ${GITHUB_REF#refs/tags/}) + # - name: Docker Login to Github Registry + # run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u vulcanize --password-stdin + # - name: Docker Pull + # run: docker pull docker.pkg.github.com/vulcanize/ipld-eth-db/ipld-eth-db:${{steps.vars.outputs.sha}} + # - name: Docker Login to Docker Registry + # run: echo ${{ secrets.VULCANIZEJENKINS_PAT }} | docker login -u vulcanizejenkins --password-stdin + # - name: Tag docker image + # run: docker tag docker.pkg.github.com/vulcanize/ipld-eth-db/ipld-eth-db:${{steps.vars.outputs.sha}} vulcanize/ipld-eth-db:${{steps.vars.outputs.tag}} + # - name: Docker Push to Docker Hub + # run: docker push vulcanize/ipld-eth-db:${{steps.vars.outputs.tag}} diff --git a/Dockerfile b/Dockerfile index b0a015d..d5e0c25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ FROM alpine WORKDIR /app -COPY --from=builder /go/src/github.com/vulcanize/ipld-eth-db/scripts/startup_script.sh . +COPY --from=builder /go/src/github.com/cerc-io/ipld-eth-db/scripts/startup_script.sh . COPY --from=builder /goose goose COPY --from=builder /go/src/github.com/cerc-io/ipld-eth-db/db/migrations migrations