Skip to content

Commit 2f88924

Browse files
committed
Merge remote-tracking branch 'origin' into Feature/NewCopilotMetrics
2 parents 8fdabe9 + 692012c commit 2f88924

File tree

9 files changed

+650
-313
lines changed

9 files changed

+650
-313
lines changed

.devcontainer/devcontainer.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
3+
{
4+
"name": "GitHub Copilot Metrics Viewer Dev Environment",
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"image": "mcr.microsoft.com/devcontainers/typescript-node:1-22-bookworm",
7+
"features": {
8+
"ghcr.io/devcontainers/features/azure-cli:1": {},
9+
"ghcr.io/devcontainers/features/github-cli:1": {}
10+
},
11+
12+
// Features to add to the dev container. More info: https://containers.dev/features.
13+
// "features": {},
14+
15+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
16+
// "forwardPorts": [],
17+
18+
// Use 'postCreateCommand' to run commands after the container is created.
19+
"postCreateCommand": "npm install && npm run serve"
20+
21+
// Configure tool-specific properties.
22+
// "customizations": {},
23+
24+
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
25+
// "remoteUser": "root"
26+
}

.github/workflows/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for more information:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
# https://containers.dev/guide/dependabot
6+
7+
version: 2
8+
updates:
9+
- package-ecosystem: "devcontainers"
10+
directory: "/"
11+
schedule:
12+
interval: weekly

api.Dockerfile

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
11
# Stage 1: Build the Vue.js application
2-
FROM node:14 AS build-stage
2+
FROM node:23 AS build-stage
33

44
USER node
55
WORKDIR /app
66

77
COPY --chown=1000:1000 package*.json ./
88
RUN npm install
99
COPY --chown=1000:1000 . .
10-
# this will tokenize the app
1110
RUN npm run build
1211

1312
# Stage 2: Prepare the Node.js API
14-
FROM node:14 AS api-stage
13+
FROM node:23 AS api-stage
14+
1515
WORKDIR /api
16+
1617
# Copy package.json and other necessary files for the API
1718
COPY --chown=1000:1000 api/package*.json ./
18-
RUN npm install \
19-
&& chown -R 1000:1000 /api
19+
RUN npm install && \
20+
chown -R 1000:1000 /api && \
21+
apt-get update && \
22+
apt-get install -y --no-install-recommends gettext-base && \
23+
apt-get clean && \
24+
rm -rf /var/lib/apt/lists/*
2025

2126
# Copy the rest of your API source code
2227
COPY --chown=1000:1000 api/ .
@@ -25,14 +30,11 @@ COPY --chown=1000:1000 api/ .
2530
COPY --chown=1000:1000 --from=build-stage /app/dist /api/public
2631
COPY --chown=1000:1000 --from=build-stage /app/dist/assets/app-config.js /api/app-config.template.js
2732

28-
# install gettext-base for envsubst
29-
RUN apt-get update && apt-get install -y gettext-base
30-
3133
# Expose the port your API will run on
3234
EXPOSE 3000
3335

3436
# Command to run your API (and serve your Vue.js app)
3537
RUN chmod +x /api/docker-entrypoint.api/entrypoint.sh
3638

3739
USER node
38-
ENTRYPOINT ["/api/docker-entrypoint.api/entrypoint.sh"]
40+
ENTRYPOINT ["/api/docker-entrypoint.api/entrypoint.sh"]

0 commit comments

Comments
 (0)