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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ tmp
__debug_*

node_modules
target
/services/core/blueprint/web-client/target/release/*
/services/core/blueprint/web-client/target/wasm32-unknown-unknown/*
main
dist

Expand Down
22 changes: 11 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@ ARG GO_VERSION=1.23
ARG ALPINE_VERSION=3.18

# Build web client (if needed)
FROM node:18 AS web-client-builder
WORKDIR /web
# FROM node:18 AS web-client-builder
# WORKDIR /web

ARG DOMAIN
ARG SERVICE
# ARG DOMAIN
# ARG SERVICE

# Install node modules
COPY ./services/${DOMAIN}/${SERVICE}/web-client/package*.json .
RUN npm install
# COPY ./services/${DOMAIN}/${SERVICE}/web-client/package*.json .
# RUN npm install

# Build dist
COPY ./services/${DOMAIN}/${SERVICE}/web-client .
ENV NODE_ENV=production
RUN npm run build
# COPY ./services/${DOMAIN}/${SERVICE}/web-client .
# ENV NODE_ENV=production
# RUN npm run build

# Make sure dist directory exists even if there's no client to build
RUN mkdir -p ./dist
# RUN mkdir -p ./dist

# Build final binary
FROM golang:${GO_VERSION}-alpine AS go-builder
Expand All @@ -40,7 +40,7 @@ go mod verify

# Copy over code
COPY ./services/${DOMAIN}/${SERVICE} .
COPY --from=web-client-builder /web/dist ./web-client/dist
# COPY --from=web-client-builder /web/dist ./web-client/dist

# Run tests
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
Expand Down
Loading