Skip to content

Commit 2b03f19

Browse files
committed
Merge branch 'feature/docker-node-alpine' into playwright-alpine
2 parents a8e5194 + b2ee225 commit 2b03f19

File tree

6 files changed

+22
-14
lines changed

6 files changed

+22
-14
lines changed

.dockerignore

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@ Dockerfile
1515
*.md
1616
azure-deploy/
1717
infra/
18-
playwright-report/
19-
test-results/
20-
test-results-docker/
18+
19+
/playwright-report/
20+
/blob-report/
21+
/playwright/.cache/
22+
23+
/test-results/
24+
/test-results-docker/
2125
test-results-docker-ent/
2226
test-results-docker-org/

.env

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@ VUE_APP_GITHUB_TOKEN=
1919

2020
# GitHub Api Url
2121
# for proxy api - set to /api/github defaults to https://api.github.com
22-
VUE_APP_GITHUB_API=
22+
VUE_APP_GITHUB_API=
23+
24+
# Random string used in API to secure session, use when VUE_APP_GITHUB_API=/api/github
25+
#SESSION_SECRET=randomstring

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ pnpm-debug.log*
2525

2626
api/public
2727
test.http
28-
/test-results/
29-
/test-results-docker/
28+
3029
/playwright-report/
3130
/blob-report/
3231
/playwright/.cache/
32+
33+
/test-results/
34+
/test-results-docker/
3335
test-results-docker-ent/
3436
test-results-docker-org/

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Stage 1: Build the Vue.js application
2-
FROM node:22 AS build-stage
2+
FROM node:23-alpine AS build-stage
33
WORKDIR /app
44
COPY package*.json ./
55
RUN npm install

api.Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# build with 'docker build -f api.Dockerfile -t api .' for production
77
ARG mode=prod
88

9-
FROM node:23 AS build-stage
9+
FROM node:23-alpine AS build-stage
1010

1111
USER node
1212
WORKDIR /app
@@ -17,18 +17,17 @@ COPY --chown=1000:1000 . .
1717
RUN npm run build
1818

1919
# Stage 2: Prepare the Node.js API
20-
FROM node:23 AS base-prod
20+
FROM node:23-alpine AS base-prod
2121

2222
WORKDIR /api
2323

2424
# Copy package.json and other necessary files for the API
2525
COPY --chown=1000:1000 api/package*.json ./
2626
RUN npm ci && \
2727
chown -R 1000:1000 /api && \
28-
apt-get update && \
29-
apt-get install -y --no-install-recommends gettext-base && \
30-
apt-get clean && \
31-
rm -rf /var/lib/apt/lists/*
28+
apk update && \
29+
apk add --no-cache gettext && \
30+
rm -rf /var/cache/apk/*
3231

3332
# Copy the rest of your API source code
3433
COPY --chown=1000:1000 api/ .

api/docker-entrypoint.api/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

33
configTemplateFile=/api/app-config.template.js
44
configTargetFile=/api/public/assets/app-config.js

0 commit comments

Comments
 (0)