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
6 changes: 3 additions & 3 deletions .env.docker-compose
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ NETWORK=mainnet
COMPOSE_PROFILES=token-registry

## Postgres Variables
POSTGRES_VERSION=14.10-alpine
POSTGRES_VERSION=17.2-alpine
POSTGRES_PORT=5432
DB_PATH=postgres14-data

Expand Down Expand Up @@ -33,10 +33,10 @@ CARDANO_DB_SYNC_DIR=db-sync-data

## Hasura Variables
HASURA_PORT=8090
CARDANO_GRAPHQL_VERSION=8.4.0
CARDANO_GRAPHQL_VERSION=8.4.1

## Token Registry Variables
TOKEN_REGISTRY_VERSION=1.3.0
TOKEN_REGISTRY_VERSION=1.3.1
TOKEN_REGISTRY_PORT=8080

## Background Variables
Expand Down
6 changes: 3 additions & 3 deletions .env.docker-compose-preprod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ NETWORK=preprod
COMPOSE_PROFILES=token-registry

## Postgres Variables
POSTGRES_VERSION=14.10-alpine
POSTGRES_VERSION=17.2-alpine
POSTGRES_PORT=5433
DB_PATH=/opt/graph-ql-preprod/sql_data

Expand Down Expand Up @@ -33,10 +33,10 @@ CARDANO_DB_SYNC_DIR=/opt/graph-ql-preprod/db-sync-data

## Hasura Variables
HASURA_PORT=8091
CARDANO_GRAPHQL_VERSION=8.3.3
CARDANO_GRAPHQL_VERSION=8.4.1

## Token Registry Variables
TOKEN_REGISTRY_VERSION=1.3.0
TOKEN_REGISTRY_VERSION=1.3.1
TOKEN_REGISTRY_PORT=8080

## Background Variables
Expand Down
59 changes: 18 additions & 41 deletions .github/workflows/post_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,8 @@ on:
- master

jobs:
push-docker-build:
strategy:
matrix:
os: [ ubuntu-24.04 ]
network: [ "mainnet", "preprod", "preview", "sanchonet" ]

runs-on: ${{ matrix.os }}
build:
runs-on: ubuntu-latest
steps:
- name: 📥 Checkout repository
uses: actions/[email protected]
Expand All @@ -21,62 +16,44 @@ jobs:

- name: 🧰 Set up Docker Buildx
uses: docker/setup-buildx-action@v1


- name: 🧰 Setup Node.js
uses: actions/setup-node@v1
with:
node-version: 14

- name: 🐳 Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}

- name: 📝 Base Variables
id: base-variables
run: |
echo ::set-output name=cardano-graphql-image::cardanofoundation/cardano-graphql
echo ::set-output name=cardano-graphql-hasura-image::cardanofoundation/cardano-graphql-hasura
echo ::set-output name=cardano-graphql-background-image::cardanofoundation/cardano-graphql-background
echo ::set-output name=cardano-graphql-server-image::cardanofoundation/cardano-graphql-server

- name: 🔨 Build and push Cardano GraphQL Server Dockerfile (default)
if: ${{ matrix.network == 'mainnet' }}

- name: Server - Build and push Docker master image
uses: docker/build-push-action@v2
with:
build-args: NETWORK=${{ matrix.network }}
context: .
push: true
tags: ${{ steps.base-variables.outputs.cardano-graphql-image }}:${{ github.sha }}, ${{ steps.base-variables.outputs.cardano-graphql-image }}:master
tags: cardanofoundation/cardano-graphql-server:master
target: server
cache-from: type=registry,ref=${{ steps.base-variables.outputs.cardano-graphql-image }}:latest
cache-to: type=inline

- name: 🔨 Build and push Cardano GraphQL Server Dockerfile (network)
- name: Background - Build and push Docker master image
uses: docker/build-push-action@v2
with:
build-args: NETWORK=${{ matrix.network }}
context: .
push: true
tags: ${{ steps.base-variables.outputs.cardano-graphql-server-image }}:${{ github.sha }}-${{ matrix.network }}, ${{ steps.base-variables.outputs.cardano-graphql-server-image }}:master-${{ matrix.network }}
target: server
cache-from: type=registry,ref=${{ steps.base-variables.outputs.cardano-graphql-server-image }}:master-${{ matrix.network }}
cache-to: type=inline

- name: 🔨 Build and push Cardano GraphQL Hasura Dockerfile
tags: cardanofoundation/cardano-graphql-background:master
target: background

- name: Hasura - Build and push Docker master image
uses: docker/build-push-action@v2
with:
build-args: NETWORK=${{ matrix.network }}
context: ./packages/api-cardano-db-hasura/hasura
file: ./packages/api-cardano-db-hasura/hasura/Dockerfile
push: true
tags: ${{ steps.base-variables.outputs.cardano-graphql-hasura-image }}:${{ github.sha }}, ${{ steps.base-variables.outputs.cardano-graphql-hasura-image }}:master
cache-from: type=registry,ref=${{ steps.base-variables.outputs.cardano-graphql-hasura-image }}:master-${{ matrix.network }}
cache-to: type=inline

- name: 🔨 Build and push Cardano GraphQL Background Dockerfile (network)
uses: docker/build-push-action@v2
with:
build-args: NETWORK=${{ matrix.network }}
context: .
push: true
tags: ${{ steps.base-variables.outputs.cardano-graphql-background-image }}:${{ github.sha }}-${{ matrix.network }}, ${{ steps.base-variables.outputs.cardano-graphql-background-image }}:master-${{ matrix.network }}
target: server
cache-from: type=registry,ref=${{ steps.base-variables.outputs.cardano-graphql-background-image }}:master-${{ matrix.network }}
cache-to: type=inline
tags: cardanofoundation/cardano-graphql-hasura:master
50 changes: 9 additions & 41 deletions .github/workflows/post_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,8 @@ on:
- published

jobs:
publish:
strategy:
matrix:
os: [ ubuntu-24.04 ]
network: [ "mainnet", "preprod", "preview", "sanchonet" ]

runs-on: ${{ matrix.os }}
build:
runs-on: ubuntu-latest
steps:
- name: 📥 Checkout repository
uses: actions/[email protected]
Expand Down Expand Up @@ -41,63 +36,36 @@ jobs:
echo ::set-output name=cardano-graphql-background-image::cardanofoundation/cardano-graphql-background
echo ::set-output name=cardano-graphql-server-image::cardanofoundation/cardano-graphql-server

- name: 🔨 Build and push Cardano GraphQL Server Dockerfile (default)
if: ${{ matrix.network == 'mainnet' }}
- name: Server - Build and push Docker ${{ github.event.release.tag_name }} image
uses: docker/build-push-action@v2
with:
cache-from: type=registry,ref=${{ steps.base-variables.outputs.cardano-graphql-image }}:latest
cache-to: type=inline
push: true
tags: ${{ steps.base-variables.outputs.cardano-graphql-image }}:${{ github.sha }}, ${{ steps.base-variables.outputs.cardano-graphql-image }}:${{ github.event.release.tag_name }}, ${{ steps.base-variables.outputs.cardano-graphql-image }}:latest
tags: cardanofoundation/cardano-graphql-server:${{ github.event.release.tag_name }}
target: server

- name: 🔨 Build and push Cardano GraphQL Server Dockerfile (network tags)
- name: Background - Build and push Docker ${{ github.event.release.tag_name }} image
uses: docker/build-push-action@v2
with:
build-args: NETWORK=${{ matrix.network }}
cache-from: type=registry,ref=${{ steps.base-variables.outputs.cardano-graphql-server-image }}:latest
cache-to: type=inline
push: true
tags: ${{ steps.base-variables.outputs.cardano-graphql-server-image }}:${{ github.sha }}-${{ matrix.network }}, ${{ steps.base-variables.outputs.cardano-graphql-server-image }}:${{ github.event.release.tag_name }}-${{ matrix.network }}, ${{ steps.base-variables.outputs.cardano-graphql-server-image }}:latest-${{ matrix.network }}
target: server

- name: 🔨 Build and push Cardano GraphQL Server Dockerfile (network tags)
uses: docker/build-push-action@v2
with:
build-args: NETWORK=${{ matrix.network }}
cache-from: type=registry,ref=${{ steps.base-variables.outputs.cardano-graphql-background-image }}:latest
cache-to: type=inline
push: true
tags: ${{ steps.base-variables.outputs.cardano-graphql-background-image }}:${{ github.sha }}-${{ matrix.network }}, ${{ steps.base-variables.outputs.cardano-graphql-background-image }}:${{ github.event.release.tag_name }}-${{ matrix.network }}, ${{ steps.base-variables.outputs.cardano-graphql-background-image }}:latest-${{ matrix.network }}
tags: cardanofoundation/cardano-graphql-background:${{ github.event.release.tag_name }}
target: background

- name: 🔨 Build and push Cardano GraphQL Hasura Dockerfile
- name: Hasura - Build and push Docker ${{ github.event.release.tag_name }} image
uses: docker/build-push-action@v2
with:
context: ./packages/api-cardano-db-hasura/hasura
file: ./packages/api-cardano-db-hasura/hasura/Dockerfile
push: true
tags: ${{ steps.base-variables.outputs.cardano-graphql-hasura-image }}:${{ github.sha }}, cardanofoundation/cardano-graphql-hasura:${{ github.event.release.tag_name }}, cardanofoundation/cardano-graphql-hasura:latest

# Removed push to npm for now, will add it later again
# - name: 📤 Publish packages to npm registry
# if: ${{ matrix.network == 'mainnet' }}
# run: |
# yarn install --offline --frozen-lockfile --non-interactive --logevel=error
# npx npm-cli-login -u ${{ secrets.NPM_REGISTRY_USER }} -e ${{ secrets.NPM_REGISTRY_EMAIL }} -p ${{ secrets.NPM_REGISTRY_TOKEN }}
# scripts/publish_packages.sh
# rm -f .npmrc
tags: cardanofoundation/cardano-graphql-hasura:${{ github.event.release.tag_name }}

- name: 🔨 Build docs
if: ${{ matrix.network == 'mainnet' }}
run: |
yarn --cwd ./docs install --frozen-lockfile
yarn --cwd ./docs build
env:
SKIP_PREFLIGHT_CHECK: true

- name: 📤 Deploy
if: ${{ matrix.network == 'mainnet' }}
uses: JamesIves/[email protected]
with:
branch: gh-pages
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ CMD ["node", "background.js"]
FROM ubuntu-nodejs AS server
ARG NETWORK=mainnet
ENV \
CARDANO_NODE_CONFIG_PATH=/config/cardano-node/config.json \
CARDANO_NODE_CONFIG_PATH=/config/network/${NETWORK}/cardano-node/config.json \
HASURA_GRAPHQL_ENABLE_TELEMETRY=false \
HASURA_URI="http://hasura:8080" \
LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" \
Expand All @@ -112,7 +112,7 @@ COPY --from=cardano-graphql-builder /app/packages/util/dist /app/packages/util/d
COPY --from=cardano-graphql-builder /app/packages/util/package.json /app/packages/util/package.json
COPY --from=cardano-graphql-production-deps /app/node_modules /app/node_modules
COPY --from=cardano-graphql-production-deps /app/packages/api-cardano-db-hasura/node_modules /app/packages/api-cardano-db-hasura/node_modules
COPY config/network/${NETWORK}/cardano-node /config/cardano-node/
COPY config /config/
WORKDIR /app/packages/server/dist
EXPOSE 3100
CMD ["node", "index.js"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Check the [releases] for the latest version.
``` console
git clone \
--single-branch \
--branch 8.4.0 \
--branch 8.4.1 \
--recurse-submodules \
https://github.com/cardano-foundation/cardano-graphql.git \
&& cd cardano-graphql
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"engines": {
"node": ">=14.15.0"
},
"version": "8.3.2",
"version": "8.4.1",
"private": true,
"workspaces": [
"packages/*"
Expand Down
4 changes: 2 additions & 2 deletions packages/api-cardano-db-hasura/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cardano-graphql/api-cardano-db-hasura",
"version": "8.0.0",
"version": "8.4.1",
"description": "Module for interfacing with the Cardano DB, populated by cardano-db-sync that utilises Hasura for a powerful query interface",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
Expand Down Expand Up @@ -34,7 +34,7 @@
"schema.graphql"
],
"dependencies": {
"@cardano-graphql/util": "8.0.0",
"@cardano-graphql/util": "8.4.1",
"@cardano-ogmios/client": "^6.0.0",
"@cardanosolutions/json-bigint": "^1.0.0",
"@emurgo/cip14-js": "^2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/api-cardano-db-hasura/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -1560,7 +1560,7 @@ type StakeRegistration_aggregate_fields {
}

type Token {
asset: Asset!
asset: Asset
quantity: String!
transactionOutput: TransactionOutput!
}
Expand Down Expand Up @@ -1896,7 +1896,7 @@ type TransactionInput_sum_fields {

type TransactionMetadata {
key: String!
value: JSON!
value: JSON
}

input TransactionMetadata_bool_exp {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cardano-graphql/cli",
"version": "8.0.0",
"version": "8.4.1",
"description": "Management tool for managing a Cardano GraphQL deployment",
"main": "./dist/index.js",
"bin": {
Expand Down
2 changes: 1 addition & 1 deletion packages/client-ts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cardano-graphql/client-ts",
"version": "8.0.0",
"version": "8.4.1",
"description": "A client package for Cardano GraphQL, including the GraphQL schema and TypeScript definitions generated from it",
"repository": {
"type": "git",
Expand Down
6 changes: 3 additions & 3 deletions packages/server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cardano-graphql/server",
"version": "8.0.0",
"version": "8.4.1",
"description": "Serve the Cardano GraphQL API over HTTP",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
Expand All @@ -24,7 +24,7 @@
},
"homepage": "https://github.com/cardano-foundation/cardano-graphql/blob/master/packages/server/README.md",
"dependencies": {
"@cardano-graphql/api-cardano-db-hasura": "8.0.0",
"@cardano-graphql/api-cardano-db-hasura": "8.4.1",
"@cardano-ogmios/schema": "6.1.0",
"@graphql-tools/merge": "^6.2.17",
"apollo-metrics": "^1.0.1",
Expand All @@ -46,7 +46,7 @@
"ts-log": "^2.2.3"
},
"devDependencies": {
"@cardano-graphql/util-dev": "8.0.0",
"@cardano-graphql/util-dev": "8.4.1",
"@graphql-codegen/cli": "^1.21.8",
"@types/death": "^1.1.1",
"@types/fs-extra": "^9.0.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/util-dev/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cardano-graphql/util-dev",
"version": "8.0.0",
"version": "8.4.1",
"description": "Common development utilities",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
Expand All @@ -22,7 +22,7 @@
},
"homepage": "https://github.com/cardano-foundation/cardano-graphql/blob/master/packages/util-dev/README.md",
"devDependencies": {
"@cardano-graphql/util": "8.0.0",
"@cardano-graphql/util": "8.4.1",
"shx": "^0.3.2"
},
"directories": {
Expand Down
2 changes: 1 addition & 1 deletion packages/util/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cardano-graphql/util",
"version": "8.0.0",
"version": "8.4.1",
"description": "Common utilities",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
Expand Down
Loading