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
1 change: 1 addition & 0 deletions .github/workflows/ccip-server-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ jobs:
platforms: ${{ steps.determine-platforms.outputs.platforms }}
build-args: |
FOUNDRY_VERSION=${{ steps.foundry-version.outputs.FOUNDRY_VERSION }}
SERVICE_VERSION=${{ steps.taggen.outputs.TAG_SHA }}-${{ steps.taggen.outputs.TAG_DATE }}

- name: Comment image tags on PR
if: github.event_name == 'pull_request'
Expand Down
3 changes: 3 additions & 0 deletions typescript/ccip-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \

# Install Foundry (Linux binaries) - pinned version for reproducibility
ARG FOUNDRY_VERSION
ARG SERVICE_VERSION=dev
ARG TARGETARCH
SHELL ["/bin/bash", "-c"]
RUN set -o pipefail && \
Expand Down Expand Up @@ -93,9 +94,11 @@ COPY --from=builder /app ./
COPY --from=builder /hyperlane-monorepo/typescript/ccip-server/prisma ./prisma

# Environment variables
ARG SERVICE_VERSION=dev
ENV NODE_ENV=production
ENV LOG_LEVEL=info
ENV SERVER_PORT=3000
ENV SERVICE_VERSION=${SERVICE_VERSION}

# Expose ports
EXPOSE 3000
Expand Down
6 changes: 3 additions & 3 deletions typescript/ccip-server/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { pinoHttp } from 'pino-http';

import { createServiceLogger } from '@hyperlane-xyz/utils';

import packageJson from '../package.json' with { type: 'json' };

import { getEnabledModules } from './config.js';
import { ServiceFactory } from './services/BaseService.js';
import { CCTPService } from './services/CCTPService.js';
Expand All @@ -25,10 +23,12 @@ export const moduleRegistry: Record<string, ServiceFactory> = {
};

async function startServer() {
const VERSION = process.env.SERVICE_VERSION || 'dev';

// Initialize logger first thing in startup
const logger = await createServiceLogger({
service: 'ccip-server',
version: packageJson.version,
version: VERSION,
});

const app = express();
Expand Down
Loading