1.1.1

rarimo · Dec 1, 2023 · 4b8c516 · 4b8c516
1 parent 98aad8c
commit 4b8c516
Show file tree

Hide file tree

Showing 22 changed files with 122 additions and 111 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+node_modules
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog], and this project adheres to [Semantic Versioning].
 
+## [1.1.1] - 2023-12-01
+### Fixed
+- Docker Compose compatibility
+
 ## [1.1.0] - 2023-12-01
 ### Added
 - Local build CI
@@ -64,7 +68,8 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 
 - Initiated project
 
-[Unreleased]: https://gitlab.com/rarimo/scan/compare/1.1.0...HEAD
+[Unreleased]: https://gitlab.com/rarimo/scan/compare/1.1.1...HEAD
+[1.1.1]: https://gitlab.com/rarimo/scan/compare/1.1.0...1.1.1
 [1.1.0]: https://gitlab.com/rarimo/scan/compare/1.0.9...1.1.0
 [1.0.9]: https://gitlab.com/rarimo/scan/compare/1.0.8...1.0.9
 [1.0.8]: https://gitlab.com/rarimo/scan/compare/1.0.7...1.0.8

diff --git a/Dockerfile b/Dockerfile
@@ -2,35 +2,33 @@ FROM node:18-alpine AS builder
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
 RUN apk add --no-cache libc6-compat
 WORKDIR /app
-COPY . ./
 
-RUN npm install --legacy-peer-deps && npm run build --legacy-peer-deps
+COPY package.json yarn.lock ./
+
+RUN npm install --legacy-peer-deps
+COPY . ./
+RUN npm run build --legacy-peer-deps
 
 # Production image, copy all the files and run next
 FROM node:18-alpine AS runner
 WORKDIR /app
 
 ENV NODE_ENV production
 
-RUN addgroup -g 1001 -S nodejs
-RUN adduser -S nextjs -u 1001
-
 # You only need to copy next.config.js if you are NOT using the default configuration
 COPY --from=builder /app/next.config.js ./
 COPY --from=builder /app/public ./public
-COPY --from=builder --chown=nextjs:nodejs /app/.next ./.next
-COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
+COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
 COPY --from=builder /app/package.json ./package.json
 COPY .env .
 
-USER nextjs
 
 EXPOSE 8000
-
 ENV PORT 8000
 
 # Next.js collects completely anonymous telemetry data about general usage.
 # Learn more here: https://nextjs.org/telemetry
 ENV NEXT_TELEMETRY_DISABLED 1
 
-CMD ["node_modules/.bin/next", "start"]
+CMD ["node", "server.js"]
diff --git a/next.config.js b/next.config.js
@@ -1,5 +1,6 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
+  output: 'standalone',
   eslint: {
     ignoreDuringBuilds: true,
   },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scan",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "gitHooks": {
     "pre-commit": "yarn lint",

diff --git a/src/callers/block.ts b/src/callers/block.ts
@@ -1,8 +1,8 @@
 import { CONFIG } from '@/config'
 import {
-  apolloClient,
   BlockFragment,
   BlockListFragment,
+  getApollo,
   GetBlockByHeight,
   GetBlockByHeightQuery,
   GetBlockCount,
@@ -30,7 +30,7 @@ export const getBlocksList = async ({
   limit?: number
   offset?: number
 }): Promise<BlockListFragment[]> => {
-  const { data } = await apolloClient.query<GetBlockListQuery>({
+  const { data } = await getApollo().query<GetBlockListQuery>({
     query: GetBlockList,
     fetchPolicy: 'network-only',
     variables: { limit, offset, where: createWhereFilter(operator) },
@@ -39,7 +39,7 @@ export const getBlocksList = async ({
 }
 
 export const getBlockCount = async (args?: { operator?: string }): Promise<number> => {
-  const { data } = await apolloClient.query<GetBlockCountQuery>({
+  const { data } = await getApollo().query<GetBlockCountQuery>({
     query: GetBlockCount,
     fetchPolicy: 'network-only',
     variables: { where: createWhereFilter(args?.operator) },
@@ -49,7 +49,7 @@ export const getBlockCount = async (args?: { operator?: string }): Promise<numbe
 }
 
 export const getBlockByHeight = async (height: number): Promise<BlockFragment> => {
-  const { data } = await apolloClient.query<GetBlockByHeightQuery>({
+  const { data } = await getApollo().query<GetBlockByHeightQuery>({
     query: GetBlockByHeight,
     fetchPolicy: 'network-only',
     variables: { height: height },

diff --git a/src/callers/collection.ts b/src/callers/collection.ts
@@ -2,10 +2,10 @@ import { TokenType } from '@rarimo/client'
 
 import { CONFIG } from '@/config'
 import {
-  apolloClient,
   Collection_Bool_Exp,
   CollectionBaseFragment,
   CollectionFragment,
+  getApollo,
   GetCollectionByIndex,
   GetCollectionByIndexQuery,
   GetCollectionCount,
@@ -27,7 +27,7 @@ export const getCollectionList = async (
   offset = 0,
   filters: TokenType[] = [],
 ): Promise<CollectionBaseFragment[]> => {
-  const { data } = await apolloClient.query<GetCollectionListQuery>({
+  const { data } = await getApollo().query<GetCollectionListQuery>({
     query: GetCollectionList,
     fetchPolicy: 'network-only',
     variables: { limit, offset, where: createCollectionWhere(filters) },
@@ -37,7 +37,7 @@ export const getCollectionList = async (
 }
 
 export const getCollectionCount = async (filters: TokenType[] = []): Promise<number> => {
-  const { data } = await apolloClient.query<GetCollectionCountQuery>({
+  const { data } = await getApollo().query<GetCollectionCountQuery>({
     query: GetCollectionCount,
     fetchPolicy: 'network-only',
     variables: { where: createCollectionWhere(filters) },
@@ -47,7 +47,7 @@ export const getCollectionCount = async (filters: TokenType[] = []): Promise<num
 }
 
 export const getCollectionByIndex = async (index: string): Promise<CollectionFragment> => {
-  const { data } = await apolloClient.query<GetCollectionByIndexQuery>({
+  const { data } = await getApollo().query<GetCollectionByIndexQuery>({
     query: GetCollectionByIndex,
     fetchPolicy: 'network-only',
     variables: { index },

diff --git a/src/callers/confirmation.ts b/src/callers/confirmation.ts
@@ -1,8 +1,8 @@
 import { CONFIG } from '@/config'
 import {
-  apolloClient,
   ConfirmationBaseFragment,
   ConfirmationFragment,
+  getApollo,
   GetConfirmationByRoot,
   GetConfirmationByRootQuery,
   GetConfirmationCount,
@@ -39,7 +39,7 @@ export const getConfirmationList = async (
   limit: number = CONFIG.PAGE_LIMIT,
   offset = 0,
 ): Promise<ConfirmationBaseFragment[]> => {
-  const { data } = await apolloClient.query<GetConfirmationListQuery>({
+  const { data } = await getApollo().query<GetConfirmationListQuery>({
     query: GetConfirmationList,
     fetchPolicy: 'network-only',
     variables: { limit, offset },
@@ -49,7 +49,7 @@ export const getConfirmationList = async (
 }
 
 export const getConfirmationCount = async (): Promise<number> => {
-  const { data } = await apolloClient.query<GetConfirmationCountQuery>({
+  const { data } = await getApollo().query<GetConfirmationCountQuery>({
     query: GetConfirmationCount,
     fetchPolicy: 'network-only',
   })
@@ -58,7 +58,7 @@ export const getConfirmationCount = async (): Promise<number> => {
 }
 
 export const getConfirmationByRoot = async (root: string): Promise<ConfirmationFragment> => {
-  const { data } = await apolloClient.query<GetConfirmationByRootQuery>({
+  const { data } = await getApollo().query<GetConfirmationByRootQuery>({
     query: GetConfirmationByRoot,
     fetchPolicy: 'network-only',
     variables: { root },
@@ -76,7 +76,7 @@ export const getConfirmationOperationList = async ({
   offset: number
   indexes: string[]
 }): Promise<OperationFragment[]> => {
-  const { data } = await apolloClient.query<GetConfirmationOperationListQuery>({
+  const { data } = await getApollo().query<GetConfirmationOperationListQuery>({
     query: GetConfirmationOperationList,
     fetchPolicy: 'network-only',
     variables: { limit, offset, where: buildOperationWhere(indexes) },
@@ -94,7 +94,7 @@ export const getConfirmationOperationVotes = async ({
   limit: number
   offset: number
 }): Promise<OperationVoteFragment[]> => {
-  const { data } = await apolloClient.query<GetConfirmationOperationVoteListQuery>({
+  const { data } = await getApollo().query<GetConfirmationOperationVoteListQuery>({
     query: GetConfirmationOperationVoteList,
     fetchPolicy: 'network-only',
     variables: { where: buildVoteWhere(indexes), limit, offset },
@@ -104,7 +104,7 @@ export const getConfirmationOperationVotes = async ({
 }
 
 export const getConfirmationOperationVoteCount = async (operations: string[]): Promise<number> => {
-  const { data } = await apolloClient.query<GetConfirmationOperationVoteCountQuery>({
+  const { data } = await getApollo().query<GetConfirmationOperationVoteCountQuery>({
     query: GetConfirmationOperationVoteCount,
     fetchPolicy: 'network-only',
     variables: { where: buildVoteWhere(operations) },

diff --git a/src/callers/network.ts b/src/callers/network.ts
@@ -1,6 +1,6 @@
 import { CONFIG } from '@/config'
 import {
-  apolloClient,
+  getApollo,
   GetNetworkByName,
   GetNetworkByNameQuery,
   GetNetworkCount,
@@ -14,7 +14,7 @@ export const getNetworkList = async (
   limit: number = CONFIG.PAGE_LIMIT,
   offset = 0,
 ): Promise<NetworkFragment[]> => {
-  const { data } = await apolloClient.query<GetNetworkListQuery>({
+  const { data } = await getApollo().query<GetNetworkListQuery>({
     query: GetNetworkList,
     fetchPolicy: 'network-only',
     variables: { limit, offset },
@@ -24,7 +24,7 @@ export const getNetworkList = async (
 }
 
 export const getNetworkCount = async (): Promise<number> => {
-  const { data } = await apolloClient.query<GetNetworkCountQuery>({
+  const { data } = await getApollo().query<GetNetworkCountQuery>({
     query: GetNetworkCount,
     fetchPolicy: 'network-only',
   })
@@ -33,7 +33,7 @@ export const getNetworkCount = async (): Promise<number> => {
 }
 
 export const getNetworkByName = async (name: string): Promise<NetworkFragment> => {
-  const { data } = await apolloClient.query<GetNetworkByNameQuery>({
+  const { data } = await getApollo().query<GetNetworkByNameQuery>({
     query: GetNetworkByName,
     fetchPolicy: 'network-only',
     variables: { name },

diff --git a/src/callers/operation.ts b/src/callers/operation.ts
@@ -1,6 +1,6 @@
 import { CONFIG } from '@/config'
 import {
-  apolloClient,
+  getApollo,
   GetOperationByIndex,
   GetOperationByIndexQuery,
   GetOperationCount,
@@ -19,7 +19,7 @@ export const getOperationList = async (
   limit: number = CONFIG.PAGE_LIMIT,
   offset = 0,
 ): Promise<OperationFragment[]> => {
-  const { data } = await apolloClient.query<GetOperationListQuery>({
+  const { data } = await getApollo().query<GetOperationListQuery>({
     query: GetOperationList,
     fetchPolicy: 'network-only',
     variables: { limit, offset },
@@ -29,7 +29,7 @@ export const getOperationList = async (
 }
 
 export const getOperationCount = async (): Promise<number> => {
-  const { data } = await apolloClient.query<GetOperationCountQuery>({
+  const { data } = await getApollo().query<GetOperationCountQuery>({
     query: GetOperationCount,
     fetchPolicy: 'network-only',
   })
@@ -38,7 +38,7 @@ export const getOperationCount = async (): Promise<number> => {
 }
 
 export const getOperationByIndex = async (index: string): Promise<GetOperationByIndexQuery> => {
-  const { data } = await apolloClient.query<GetOperationByIndexQuery>({
+  const { data } = await getApollo().query<GetOperationByIndexQuery>({
     query: GetOperationByIndex,
     fetchPolicy: 'network-only',
     variables: { index },
@@ -56,7 +56,7 @@ export const getOperationVotes = async ({
   limit: number
   offset: number
 }): Promise<OperationVoteFragment[]> => {
-  const { data } = await apolloClient.query<GetOperationVoteListQuery>({
+  const { data } = await getApollo().query<GetOperationVoteListQuery>({
     query: GetOperationVoteList,
     fetchPolicy: 'network-only',
     variables: { operation, limit, offset },
@@ -66,7 +66,7 @@ export const getOperationVotes = async ({
 }
 
 export const getOperationVoteCount = async (operation: string): Promise<number> => {
-  const { data } = await apolloClient.query<GetOperationVoteCountQuery>({
+  const { data } = await getApollo().query<GetOperationVoteCountQuery>({
     query: GetOperationVoteCount,
     fetchPolicy: 'network-only',
     variables: { operation },

diff --git a/src/callers/proposal.ts b/src/callers/proposal.ts
@@ -1,5 +1,5 @@
 import { CONFIG } from '@/config'
-import { apolloClient } from '@/graphql'
+import { getApollo } from '@/graphql'
 import {
   GetProposalBase,
   GetProposalBaseQuery,
@@ -25,7 +25,7 @@ export const getProposalList = async (
   limit: number = CONFIG.PAGE_LIMIT,
   offset = 0,
 ): Promise<ProposalBaseFragment[]> => {
-  const { data } = await apolloClient.query<GetProposalBaseQuery>({
+  const { data } = await getApollo().query<GetProposalBaseQuery>({
     query: GetProposalBase,
     fetchPolicy: 'network-only',
     variables: { limit, offset },
@@ -35,7 +35,7 @@ export const getProposalList = async (
 }
 
 export const getProposalCount = async (): Promise<number> => {
-  const { data } = await apolloClient.query<GetProposalCountQuery>({
+  const { data } = await getApollo().query<GetProposalCountQuery>({
     query: GetProposalCount,
     fetchPolicy: 'network-only',
   })
@@ -44,7 +44,7 @@ export const getProposalCount = async (): Promise<number> => {
 }
 
 export const getProposalByID = async (id: string): Promise<ProposalFragment> => {
-  const { data } = await apolloClient.query<GetProposalByIdQuery>({
+  const { data } = await getApollo().query<GetProposalByIdQuery>({
     query: GetProposalById,
     fetchPolicy: 'network-only',
     variables: { id: Number(id) },
@@ -58,7 +58,7 @@ export const getProposalDepositsListByID = async (
   limit: number = CONFIG.PAGE_LIMIT,
   offset = 0,
 ): Promise<ProposalDepositFragment[]> => {
-  const { data } = await apolloClient.query<GetProposalDepositsByIdQuery>({
+  const { data } = await getApollo().query<GetProposalDepositsByIdQuery>({
     query: GetProposalDepositsById,
     fetchPolicy: 'network-only',
     variables: { id: Number(id), limit, offset },
@@ -68,7 +68,7 @@ export const getProposalDepositsListByID = async (
 }
 
 export const getProposalDepositsCountByID = async (id: string): Promise<number> => {
-  const { data } = await apolloClient.query<GetProposalDepositsCountByIdQuery>({
+  const { data } = await getApollo().query<GetProposalDepositsCountByIdQuery>({
     query: GetProposalDepositsCountById,
     fetchPolicy: 'network-only',
     variables: { id: Number(id) },
@@ -82,7 +82,7 @@ export const getProposalVotesListByID = async (
   limit: number = CONFIG.PAGE_LIMIT,
   offset = 0,
 ): Promise<ProposalVoteFragment[]> => {
-  const { data } = await apolloClient.query<GetProposalVotesByIdQuery>({
+  const { data } = await getApollo().query<GetProposalVotesByIdQuery>({
     query: GetProposalVotesById,
     fetchPolicy: 'network-only',
     variables: { id: Number(id), limit, offset },
@@ -92,7 +92,7 @@ export const getProposalVotesListByID = async (
 }
 
 export const getProposalVotesCountByID = async (id: string): Promise<number> => {
-  const { data } = await apolloClient.query<GetProposalVotesCountByIdQuery>({
+  const { data } = await getApollo().query<GetProposalVotesCountByIdQuery>({
     query: GetProposalVotesCountById,
     fetchPolicy: 'network-only',
     variables: { id: Number(id) },