Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/docker/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ inputs:
description: Push tags to registry or digest only
default: "false"
target:
description: "Target stage within Dockerfile: dapi, drive-abci, dashmate-helper, test-suite"
description: "Target stage within Dockerfile: drive-abci, rs-dapi, dashmate-helper, test-suite"
platform:
description: Platform to build for. i.e linux/amd64 or linux/arm64
required: true
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/local-network/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ runs:
docker pull ${{ inputs.image_org }}/dashmate-helper:$SHA_TAG
docker tag ${{ inputs.image_org }}/dashmate-helper:$SHA_TAG dashpay/dashmate-helper:$VERSION

# Replace Drive, DAPI, and RS-DAPI images with new org and tag in dashmate config
sed -i -E "s/dashpay\/(drive|dapi|rs-dapi):[^\"]+/${{ inputs.image_org }}\/\1:${SHA_TAG}/g" ${{ env.HOME }}/.dashmate/config.json
# Replace Drive and RS-DAPI images with new org and tag in dashmate config
sed -i -E "s/dashpay\/(drive|rs-dapi):[^\"]+/${{ inputs.image_org }}\/\1:${SHA_TAG}/g" ${{ env.HOME }}/.dashmate/config.json

cat ${{ env.HOME }}/.dashmate/config.json

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ on:
required: true
image_name:
type: string
description: Image name. i.e. drive, dapi
description: Image name. i.e. drive, rs-dapi
required: true
image_org:
type: string
description: Image org. i.e. dashpay
required: true
target:
type: string
description: Image target. i.e. drive-abci, dapi
description: Image target. i.e. drive-abci, rs-dapi
required: true
tag:
type: string
Expand Down
12 changes: 0 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,18 +179,6 @@ jobs:
cargo_profile: dev
tag: ${{ inputs.tag || github.event.release.tag_name }}-debug

release-dapi-image:
name: Release DAPI image
if: ${{ !inputs.only_drive }}
secrets: inherit
uses: ./.github/workflows/release-docker-image.yml
with:
name: DAPI
image_org: dashpay
image_name: dapi
target: dapi
tag: ${{ inputs.tag || github.event.release.tag_name }}

release-rs-dapi-image:
name: Release RS-DAPI image
if: ${{ !inputs.only_drive }}
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/tests-dashmate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@ jobs:
docker pull $DOCKER_HUB_ORG/drive:$SHA_TAG
docker tag $DOCKER_HUB_ORG/drive:$SHA_TAG $DRIVE_IMAGE_AND_VERSION

# DAPI
DAPI_IMAGE_AND_VERSION=$(yarn dashmate config get --config=local platform.dapi.api.docker.image)
docker pull $DOCKER_HUB_ORG/dapi:$SHA_TAG
docker tag $DOCKER_HUB_ORG/dapi:$SHA_TAG $DAPI_IMAGE_AND_VERSION

# RS-DAPI
RS_DAPI_IMAGE_AND_VERSION=$(yarn dashmate config get --config=local platform.dapi.rsDapi.docker.image)
docker pull $DOCKER_HUB_ORG/rs-dapi:$SHA_TAG
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ jobs:
- name: Drive
image_name: drive
target: drive-abci
- name: DAPI
image_name: dapi
target: dapi
- name: RS-DAPI
image_name: rs-dapi
target: rs-dapi
Expand Down
Loading
Loading