Skip to content

Commit f6b6b3b

Browse files
committed
⬆️(front) upgrade to node 16
We need node 16 to use node-sass
1 parent 6098c3d commit f6b6b3b

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

.circleci/config.yml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@ jobs:
9696
# Generate a version.json file describing app release
9797
- <<: *generate-version-file
9898
# Activate docker-in-docker
99-
- setup_remote_docker:
100-
version: 19.03.13
99+
- setup_remote_docker
101100
# Each image is tagged with the current git commit sha1 to avoid collisions in parallel builds.
102101
- run:
103102
name: Build production image
@@ -266,8 +265,7 @@ jobs:
266265
# Generate a version.json file describing app release
267266
- <<: *generate-version-file
268267
# Activate docker-in-docker
269-
- setup_remote_docker:
270-
version: 19.03.13
268+
- setup_remote_docker
271269
- run:
272270
name: Build production image
273271
command: docker build -t ashley:${CIRCLE_SHA1} --target production .
@@ -328,15 +326,15 @@ jobs:
328326
# ---- Front-end jobs ----
329327
build-front:
330328
docker:
331-
- image: circleci/node:14
329+
- image: circleci/node:16
332330
working_directory: ~/fun/src/frontend
333331
steps:
334332
- checkout:
335333
path: ~/fun
336334
- restore_cache:
337335
keys:
338-
- v3-front-dependencies-{{ checksum "yarn.lock" }}
339-
- v3-front-dependencies
336+
- v4-front-dependencies-{{ checksum "yarn.lock" }}
337+
- v4-front-dependencies
340338
# If the yarn.lock file is not up-to-date with the package.json file,
341339
# using the --frozen-lockfile should fail.
342340
- run:
@@ -358,19 +356,19 @@ jobs:
358356
- save_cache:
359357
paths:
360358
- ./node_modules
361-
key: v3-front-dependencies-{{ checksum "yarn.lock" }}
359+
key: v4-front-dependencies-{{ checksum "yarn.lock" }}
362360

363361
build-front-production:
364362
docker:
365-
- image: circleci/node:14
363+
- image: circleci/node:16
366364
working_directory: ~/fun/src/frontend
367365
steps:
368366
- checkout:
369367
path: ~/fun
370368
- restore_cache:
371369
keys:
372-
- v3-front-dependencies-{{ checksum "yarn.lock" }}
373-
- v3-front-dependencies-
370+
- v4-front-dependencies-{{ checksum "yarn.lock" }}
371+
- v4-front-dependencies-
374372
- run:
375373
name: Build front-end application in production mode
376374
command: yarn build-production
@@ -397,14 +395,14 @@ jobs:
397395
- src/ashley/static/ashley/font/*
398396
lint-front:
399397
docker:
400-
- image: circleci/node:14
398+
- image: circleci/node:16
401399
working_directory: ~/fun/src/frontend
402400
steps:
403401
- checkout:
404402
path: ~/fun
405403
- restore_cache:
406404
keys:
407-
- v3-front-dependencies-{{ checksum "yarn.lock" }}
405+
- v4-front-dependencies-{{ checksum "yarn.lock" }}
408406
- run:
409407
name: Lint code with tslint
410408
command: yarn lint
@@ -414,14 +412,14 @@ jobs:
414412

415413
test-front:
416414
docker:
417-
- image: circleci/node:14
415+
- image: circleci/node:16
418416
working_directory: ~/fun/src/frontend
419417
steps:
420418
- checkout:
421419
path: ~/fun
422420
- restore_cache:
423421
keys:
424-
- v3-front-dependencies-{{ checksum "yarn.lock" }}
422+
- v4-front-dependencies-{{ checksum "yarn.lock" }}
425423
- run:
426424
name: Run tests
427425
# Circle CI needs the tests to be run sequentially, otherwise it hangs. See Jest docs below:
@@ -430,7 +428,7 @@ jobs:
430428

431429
test-front-package:
432430
docker:
433-
- image: circleci/node:14
431+
- image: circleci/node:16
434432
working_directory: ~/wrk
435433
steps:
436434
- checkout:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FROM python:3.8-slim AS base
2121
RUN pip install --upgrade pip
2222

2323
# ---- Front-end builder image ----
24-
FROM node:14 AS front-builder
24+
FROM node:16 AS front-builder
2525

2626
# Copy frontend app sources
2727
COPY ./src/frontend /builder/src/frontend

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ services:
4646
working_dir: /app
4747

4848
node:
49-
image: node:14
49+
image: node:16
5050
working_dir: /app/src/frontend
5151
user: "${DOCKER_USER:-1000}"
5252
volumes:

0 commit comments

Comments
 (0)