Skip to content

Commit 98caf82

Browse files
authored
Deploy Jan 10, 2024 (#461)
2 parents 4732588 + e947dba commit 98caf82

File tree

7 files changed

+951
-859
lines changed

7 files changed

+951
-859
lines changed

.circleci/config.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ workflows:
4444
jobs:
4545
- tests
4646
- python
47-
- lint-js
47+
- lint
4848
- build
4949
- yarn_lock
5050
- typescript
@@ -80,11 +80,12 @@ workflows:
8080
- docker
8181

8282
jobs:
83-
lint-js:
83+
lint:
8484
executor: node
8585
steps:
8686
- checkout-and-dependencies
8787
- run: yarn lint-js
88+
- run: yarn prettier-run
8889

8990
tests:
9091
executor: node

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
# instead of the default. See docs-developer/docker.md for more information.
1212

1313
# Setup a container and build the project in it
14-
# We set up a node 18 running in latest Debian stable called bullseye, in the
14+
# We set up a node 18 running in latest Debian stable called bookworm, in the
1515
# "slim" flavor because we don't need the big version.
16-
FROM node:18-bullseye-slim AS builder
16+
# NOTE: if you update the image here, don't forget to update it below as well.
17+
FROM node:18-bookworm-slim AS builder
1718

1819
# Create the user we'll run the build commands with. Its home is configured to
1920
# be the directory /app. It helps avoiding warnings when running tests and
@@ -86,7 +87,7 @@ RUN du -khs node_modules
8687
RUN ls -la
8788

8889
# ----- And now, let's build the runtime container -----
89-
FROM node:18-bullseye-slim
90+
FROM node:18-bookworm-slim
9091
ENV NODE_ENV="production"
9192
ENV PORT=8000
9293

docs-developer/docker.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ Especially the environment variable `JWT_SECRET` needs to be set.
3535

3636
If the variable `GCS_AUTHENTICATION_PATH` is set the pointed file will be
3737
mounted to the docker instance as well, so that Google Storage authentication
38-
works.
38+
works. Make sure to change its group to "10001" so that the docker image can
39+
access it.
3940

4041
The app should listen on port 8000. The container is named `profiler-server`.
4142

loadtest/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
# runtime with the env variable API_ENDPOINT.
1212

1313
# Setup a container and download the project in it
14-
# We set up a python 3 running in latest Debian stable called bullseye, in the
14+
# We set up a python 3 running in latest Debian stable called bookworm, in the
1515
# "slim" flavor because we don't need the big version.
16-
FROM python:3-slim-bullseye
16+
FROM python:3-slim-bookworm
1717

1818
# Create the user we'll run the build commands with. Its home is configured to
1919
# be the directory /app. It helps avoiding warnings when running tests and
@@ -28,8 +28,9 @@ RUN mkdir /app \
2828

2929
# Install various needed packages:
3030
# - git, as we'll need it to pull molotov
31+
# - build tools, as this is needed for some Python packages
3132
RUN apt-get update \
32-
&& apt-get install -y --no-install-recommends git \
33+
&& apt-get install -y --no-install-recommends git build-essential \
3334
# and clean the downloaded lists so that they don't increase the layer size.
3435
&& rm -rf /var/lib/apt/lists/*
3536

package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -35,42 +35,42 @@
3535
"ts-generate-types": "npx --yes dts-gen -m"
3636
},
3737
"devDependencies": {
38-
"@babel/cli": "^7.23.0",
39-
"@babel/core": "^7.23.0",
40-
"@babel/eslint-parser": "^7.22.15",
41-
"@babel/eslint-plugin": "^7.22.10",
38+
"@babel/cli": "^7.23.4",
39+
"@babel/core": "^7.23.7",
40+
"@babel/eslint-parser": "^7.23.3",
41+
"@babel/eslint-plugin": "^7.23.5",
4242
"@babel/node": "^7.22.19",
4343
"@babel/plugin-proposal-class-properties": "^7.18.6",
4444
"@babel/plugin-proposal-object-rest-spread": "^7.20.7",
45-
"@babel/preset-env": "^7.22.20",
46-
"@babel/preset-typescript": "^7.23.0",
47-
"@types/content-type": "^1.1.6",
48-
"@types/convict": "^6.1.4",
49-
"@types/jest": "^29.5.5",
50-
"@types/jsonwebtoken": "^9.0.3",
51-
"@types/koa__cors": "^4.0.1",
52-
"@types/koa__router": "^12.0.1",
53-
"@types/node": "^20.6.3",
45+
"@babel/preset-env": "^7.23.7",
46+
"@babel/preset-typescript": "^7.23.3",
47+
"@types/content-type": "^1.1.8",
48+
"@types/convict": "^6.1.6",
49+
"@types/jest": "^29.5.11",
50+
"@types/jsonwebtoken": "^9.0.5",
51+
"@types/koa__cors": "^4.0.3",
52+
"@types/koa__router": "^12.0.4",
53+
"@types/node": "^20.10.5",
5454
"@types/node-fetch": "^2.6.2",
55-
"@types/supertest": "^2.0.13",
56-
"@typescript-eslint/eslint-plugin": "^6.7.0",
57-
"@typescript-eslint/parser": "^6.7.0",
55+
"@types/supertest": "^6.0.2",
56+
"@typescript-eslint/eslint-plugin": "^6.13.2",
57+
"@typescript-eslint/parser": "^6.13.2",
5858
"babel-jest": "^29.7.0",
5959
"devtools-license-check": "^0.9.0",
60-
"eslint": "^8.49.0",
61-
"eslint-config-prettier": "^9.0.0",
62-
"eslint-plugin-import": "^2.28.1",
60+
"eslint": "^8.56.0",
61+
"eslint-config-prettier": "^9.1.0",
62+
"eslint-plugin-import": "^2.29.1",
6363
"husky": "^4.3.8",
6464
"jest": "^29.7.0",
6565
"lockfile-lint": "^4.12.1",
6666
"mkdirp": "^3.0.1",
67-
"nock": "^13.3.3",
68-
"nodemon": "^3.0.1",
67+
"nock": "^13.4.0",
68+
"nodemon": "^3.0.2",
6969
"npm-run-all": "^4.1.5",
70-
"prettier": "^3.0.3",
70+
"prettier": "^3.1.1",
7171
"rimraf": "^5.0.5",
7272
"supertest": "^6.3.3",
73-
"typescript": "^5.2.2"
73+
"typescript": "^5.3.3"
7474
},
7575
"husky": {
7676
"hooks": {
@@ -81,14 +81,14 @@
8181
}
8282
},
8383
"dependencies": {
84-
"@google-cloud/storage": "^7.1.0",
84+
"@google-cloud/storage": "^7.7.0",
8585
"@koa/cors": "^4.0.0",
86-
"@koa/router": "^12.0.0",
86+
"@koa/router": "^12.0.1",
8787
"content-type": "^1.0.5",
8888
"convict": "^6.2.4",
8989
"dotenv": "^16.3.1",
9090
"jsonwebtoken": "^9.0.2",
91-
"koa": "^2.14.2",
91+
"koa": "^2.15.0",
9292
"koa-helmet": "^7.0.2",
9393
"koa-json-body": "^5.3.0",
9494
"koa-jwt": "^4.0.4",

src/log.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ const logLevelFromEnvironment = toValidLogLevel(process.env.LOG_LEVEL);
4545
export const logLevel: LowerCasedLogLevel = logLevelFromEnvironment
4646
? logLevelFromEnvironment
4747
: isProduction
48-
? 'info'
49-
: 'debug';
48+
? 'info'
49+
: 'debug';
5050

5151
export const getLogger = mozlog({
5252
app: 'FirefoxProfiler',

0 commit comments

Comments
 (0)