From 3c2dfcf3228d1c83bd8ed9b14f68ceb0f49ee4a8 Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Sun, 4 May 2025 17:04:42 +0800 Subject: [PATCH] refactor: update Dockerfile paths for analytics service --- .github/workflows/build.yml | 2 +- app/Dockerfile | 4 ++-- docker-compose.prod.yml | 2 +- quests/Dockerfile | 6 +++--- server/Dockerfile | 2 +- services/analytics/Dockerfile | 11 ++++++----- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a9bf3e..ef704eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: uses: ./.github/workflows/build-docker-image.yml with: imageName: 'linuxodyssey/analytics' - dockerfilePath: './packages/analytics/Dockerfile' + dockerfilePath: './services/analytics/Dockerfile' target: prod secrets: inherit diff --git a/app/Dockerfile b/app/Dockerfile index c3be3df..3c3e03b 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -1,5 +1,5 @@ # Base stage -FROM node:20-alpine as build +FROM node:20-alpine AS build WORKDIR /app COPY package.json yarn.lock ./ @@ -14,7 +14,7 @@ COPY app ./app RUN yarn workspace app build # 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 deployment/nginx.conf /etc/nginx/conf.d/default.conf EXPOSE 80 diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 06099cb..ad4fddd 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -41,7 +41,7 @@ services: image: linuxodyssey/analytics build: context: . - dockerfile: packages/analytics/Dockerfile + dockerfile: services/analytics/Dockerfile target: prod restart: always depends_on: diff --git a/quests/Dockerfile b/quests/Dockerfile index 46c371c..fcbb330 100644 --- a/quests/Dockerfile +++ b/quests/Dockerfile @@ -1,11 +1,11 @@ -FROM golang:1.24-alpine as cmd-hook-builder +FROM golang:1.24-alpine AS cmd-hook-builder WORKDIR /app COPY ./services/cmd-hook/go.mod ./ RUN go mod download COPY ./services/cmd-hook/*.go ./ RUN go build -o cmd-hook -FROM golang:1.24-alpine as terminal-builder +FROM golang:1.24-alpine AS terminal-builder WORKDIR /app COPY ./services/terminal-service/go.mod ./ COPY ./services/terminal-service/go.sum ./ @@ -13,7 +13,7 @@ RUN go mod download COPY ./services/terminal-service/*.go ./services/terminal-service/index.html ./ RUN go build -o terminal-service -FROM debian:bookworm-slim as main +FROM debian:bookworm-slim AS main LABEL maintainer="wancat@wancat.cc" diff --git a/server/Dockerfile b/server/Dockerfile index e6aa1f6..f2b5e93 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -11,7 +11,7 @@ COPY tsconfig.json ./tsconfig.json RUN yarn workspace server build # Production -FROM node:20-alpine as prod +FROM node:20-alpine AS prod WORKDIR /app COPY --from=docker:dind /usr/local/bin/docker /usr/local/bin/ diff --git a/services/analytics/Dockerfile b/services/analytics/Dockerfile index ba32932..973c62c 100644 --- a/services/analytics/Dockerfile +++ b/services/analytics/Dockerfile @@ -1,26 +1,27 @@ -FROM node:20-alpine as build +FROM node:20-alpine AS build WORKDIR /app 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 COPY tsconfig.json ./tsconfig.json COPY packages ./packages +COPY services/analytics ./services/analytics RUN yarn workspace analytics build # Production stage -FROM node:20-alpine as prod +FROM node:20-alpine AS prod WORKDIR /app 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 HOST=0.0.0.0 ENV PORT=3001 EXPOSE 3001 -WORKDIR /app/packages/analytics +WORKDIR /app/services/analytics CMD [ "yarn", "start" ] \ No newline at end of file