refactor: update Dockerfile paths for analytics service

This commit is contained in:
Justin Lin committed 2025-05-05 19:55:41 +08:00
1 parent 0341efdd50
commit 3c2dfcf322
6 files changed
+14 -13

No files matched your search

+1 -1
View File
@@ -24,7 +24,7 @@ jobs:
uses: ./.github/workflows/build-docker-image.yml uses: ./.github/workflows/build-docker-image.yml
with: with:
imageName: 'linuxodyssey/analytics' imageName: 'linuxodyssey/analytics'
dockerfilePath: './packages/analytics/Dockerfile' dockerfilePath: './services/analytics/Dockerfile'
target: prod target: prod
secrets: inherit secrets: inherit
+2 -2
View File
@@ -1,5 +1,5 @@
# Base stage # Base stage
FROM node:20-alpine as build FROM node:20-alpine AS build
WORKDIR /app WORKDIR /app
COPY package.json yarn.lock ./ COPY package.json yarn.lock ./
@@ -14,7 +14,7 @@ COPY app ./app
RUN yarn workspace app build RUN yarn workspace app build
# Production stage # Production stage
FROM nginx:stable-alpine as prod FROM nginx:stable-alpine AS prod
COPY --from=build /app/app/dist /usr/share/nginx/html COPY --from=build /app/app/dist /usr/share/nginx/html
COPY deployment/nginx.conf /etc/nginx/conf.d/default.conf COPY deployment/nginx.conf /etc/nginx/conf.d/default.conf
EXPOSE 80 EXPOSE 80
+1 -1
View File
@@ -41,7 +41,7 @@ services:
image: linuxodyssey/analytics image: linuxodyssey/analytics
build: build:
context: . context: .
dockerfile: packages/analytics/Dockerfile dockerfile: services/analytics/Dockerfile
target: prod target: prod
restart: always restart: always
depends_on: depends_on:
+3 -3
View File
@@ -1,11 +1,11 @@
FROM golang:1.24-alpine as cmd-hook-builder FROM golang:1.24-alpine AS cmd-hook-builder
WORKDIR /app WORKDIR /app
COPY ./services/cmd-hook/go.mod ./ COPY ./services/cmd-hook/go.mod ./
RUN go mod download RUN go mod download
COPY ./services/cmd-hook/*.go ./ COPY ./services/cmd-hook/*.go ./
RUN go build -o cmd-hook RUN go build -o cmd-hook
FROM golang:1.24-alpine as terminal-builder FROM golang:1.24-alpine AS terminal-builder
WORKDIR /app WORKDIR /app
COPY ./services/terminal-service/go.mod ./ COPY ./services/terminal-service/go.mod ./
COPY ./services/terminal-service/go.sum ./ COPY ./services/terminal-service/go.sum ./
@@ -13,7 +13,7 @@ RUN go mod download
COPY ./services/terminal-service/*.go ./services/terminal-service/index.html ./ COPY ./services/terminal-service/*.go ./services/terminal-service/index.html ./
RUN go build -o terminal-service RUN go build -o terminal-service
FROM debian:bookworm-slim as main FROM debian:bookworm-slim AS main
LABEL maintainer="wancat@wancat.cc" LABEL maintainer="wancat@wancat.cc"
+1 -1
View File
@@ -11,7 +11,7 @@ COPY tsconfig.json ./tsconfig.json
RUN yarn workspace server build RUN yarn workspace server build
# Production # Production
FROM node:20-alpine as prod FROM node:20-alpine AS prod
WORKDIR /app WORKDIR /app
COPY --from=docker:dind /usr/local/bin/docker /usr/local/bin/ COPY --from=docker:dind /usr/local/bin/docker /usr/local/bin/
+6 -5
View File
@@ -1,26 +1,27 @@
FROM node:20-alpine as build FROM node:20-alpine AS build
WORKDIR /app WORKDIR /app
COPY ./package.json yarn.lock ./ COPY ./package.json yarn.lock ./
COPY packages/analytics/package.json ./packages/analytics/package.json COPY services/analytics/package.json ./services/analytics/package.json
RUN yarn install --frozen-lockfile RUN yarn install --frozen-lockfile
COPY tsconfig.json ./tsconfig.json COPY tsconfig.json ./tsconfig.json
COPY packages ./packages COPY packages ./packages
COPY services/analytics ./services/analytics
RUN yarn workspace analytics build RUN yarn workspace analytics build
# Production stage # Production stage
FROM node:20-alpine as prod FROM node:20-alpine AS prod
WORKDIR /app WORKDIR /app
COPY --from=build /app/node_modules ./node_modules COPY --from=build /app/node_modules ./node_modules
COPY --from=build /app/packages/analytics ./packages/analytics COPY --from=build /app/services/analytics ./services/analytics
ENV NODE_ENV=production ENV NODE_ENV=production
ENV HOST=0.0.0.0 ENV HOST=0.0.0.0
ENV PORT=3001 ENV PORT=3001
EXPOSE 3001 EXPOSE 3001
WORKDIR /app/packages/analytics WORKDIR /app/services/analytics
CMD [ "yarn", "start" ] CMD [ "yarn", "start" ]