diff --git a/ccdscan/frontend.Dockerfile b/ccdscan/frontend.Dockerfile index f42c90a..9f3743f 100644 --- a/ccdscan/frontend.Dockerfile +++ b/ccdscan/frontend.Dockerfile @@ -1,4 +1,4 @@ -# Except for usage in FROM, these ARGs need to be redeclared in the contexts that they're used in. +# Except for usage in FROM, toplevel ARGs need to be redeclared in the contexts that they're used in. # Default values defined here will still apply if they're not overridden. ARG git_repo_url='https://github.com/Concordium/concordium-scan.git' ARG tag='main' @@ -12,7 +12,6 @@ RUN git \ -c advice.detachedHead=false \ clone \ --branch="${tag}" \ - --recurse-submodules \ --depth=1 \ "${git_repo_url}" \ . @@ -21,16 +20,17 @@ RUN git \ FROM node:16-slim AS build WORKDIR /build COPY --from=source /source/frontend . -ARG network RUN yarn install # Replace Nuxt config with one that sets preset "node-server" (instead of Firebase) and uses backend from the local deployment. COPY ./nuxt.config.ts . +# Note that 'ENVIRONMENT' is hardcoded in the custom Nuxt config. +# The value is only used for resolving backend URLs which we hardcode +# and for controlling on which network to enable "developer" features that we just want to be always enabled. RUN yarn build ENTRYPOINT ["node", "./.output/server/index.mjs"] # Serve artifacts. FROM node:16-slim -# Override config with patched version that enables 'mod_rewrite'. WORKDIR /target COPY --from=build /build/.output . ENTRYPOINT ["node", "./server/index.mjs"] diff --git a/ccdscan/nuxt.config.ts b/ccdscan/nuxt.config.ts index b6473de..9eb0689 100644 --- a/ccdscan/nuxt.config.ts +++ b/ccdscan/nuxt.config.ts @@ -13,9 +13,9 @@ export default defineNuxtConfig({ ], publicRuntimeConfig: { apiUrl: 'http://localhost:5000/graphql', - wsUrl: 'wss://localhost:5000/graphql', + wsUrl: 'ws://localhost:5000/graphql', environment: 'dev', // enables some error reporting or something - includeDevTools: false, + includeDevTools: true, }, nitro: { // Should be "node-server", but that doesn't work with the current dependency versions diff --git a/docker-compose.ccdscan.yaml b/docker-compose.ccdscan.yaml index 77c3dc1..0f5b746 100644 --- a/docker-compose.ccdscan.yaml +++ b/docker-compose.ccdscan.yaml @@ -16,8 +16,7 @@ services: context: ./ccdscan dockerfile: ./frontend.Dockerfile args: - tag: main - network: ${NETWORK} + tag: frontend/${CCDSCAN_FRONTEND_VERSION} ccdscan_backend: image: ${CCDSCAN_BACKEND_IMAGE} ports: @@ -25,7 +24,7 @@ services: environment: - ImportValidation__Enabled=false - ConcordiumNodeGrpc__AuthenticationToken=rpcadmin - - ConcordiumNodeGrpc__Address=http://node:10000 + - ConcordiumNodeGrpc__Address=http://node:11000 - PostgresDatabase__ConnectionString= Host=ccdscan_timescaledb; Port=5432; @@ -52,7 +51,7 @@ services: restart: unless-stopped # it seems like startup sometimes fails because the DB isn't ready yet # TODO Connect to external DB by default and enable this with another override. ccdscan_timescaledb: - image: ${CCDSCAN_TIMESCALEDB_IMAGE-timescale/timescaledb:latest-pg13} + image: ${CCDSCAN_TIMESCALEDB_IMAGE-timescale/timescaledb:latest-pg14} environment: - POSTGRES_PASSWORD=password networks: diff --git a/mainnet.env b/mainnet.env index c44e45f..a7d9ac9 100644 --- a/mainnet.env +++ b/mainnet.env @@ -24,5 +24,7 @@ ROSETTA_IMAGE=concordium/rosetta:1.1.0-1 ROSETTA_NETWORK=${NETWORK} # CCDScan (not enabled by default). -CCDSCAN_FRONTEND_IMAGE=bisgardo/ccdscan-frontend:${NETWORK} -CCDSCAN_BACKEND_IMAGE=concordium/ccdscan:1.2.0-0 +CCDSCAN_FRONTEND_VERSION=1.5.38 +CCDSCAN_BACKEND_VERSION=1.8.14-1 +CCDSCAN_FRONTEND_IMAGE=ccdscan-frontend:${CCDSCAN_FRONTEND_VERSION} +CCDSCAN_BACKEND_IMAGE=concordium/ccdscan:${CCDSCAN_BACKEND_VERSION} diff --git a/testnet.env b/testnet.env index 65506f2..969a7a9 100644 --- a/testnet.env +++ b/testnet.env @@ -24,5 +24,7 @@ ROSETTA_IMAGE=concordium/rosetta:1.1.0-1 ROSETTA_NETWORK=${NETWORK} # CCDScan (not enabled by default). -CCDSCAN_FRONTEND_IMAGE=bisgardo/ccdscan-frontend:${NETWORK} -CCDSCAN_BACKEND_IMAGE=concordium/ccdscan:1.2.0-0 +CCDSCAN_FRONTEND_VERSION=1.5.38 +CCDSCAN_BACKEND_VERSION=1.8.14-1 +CCDSCAN_FRONTEND_IMAGE=ccdscan-frontend:${CCDSCAN_FRONTEND_VERSION} +CCDSCAN_BACKEND_IMAGE=concordium/ccdscan:${CCDSCAN_BACKEND_VERSION}