Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
# Check that the CHANGELOG has been updated in the current branch
check-changelog:
docker:
- image: circleci/buildpack-deps:stretch-scm
- image: cimg/base:current
working_directory: ~/fun
steps:
- checkout
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
# Build the Docker image ready for production
build-docker:
docker:
- image: circleci/buildpack-deps:stretch
- image: cimg/base:current
working_directory: ~/fun
steps:
# Checkout repository sources
Expand All @@ -97,7 +97,7 @@ jobs:
- <<: *generate-version-file
# Activate docker-in-docker
- setup_remote_docker:
version: 19.03.13
version: default
# Each image is tagged with the current git commit sha1 to avoid collisions in parallel builds.
- run:
name: Build production image
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:
ELASTICSEARCH_PORT: 9200
DJANGO_AWS_S3_REGION_NAME: eu-west-1
# services
- image: circleci/postgres:12-ram
- image: cimg/postgres:13.16
environment:
POSTGRES_DB: test_ashley
POSTGRES_USER: fun
Expand Down Expand Up @@ -328,7 +328,7 @@ jobs:
# ---- Front-end jobs ----
build-front:
docker:
- image: circleci/node:14
- image: cimg/node:16.15
working_directory: ~/fun/src/frontend
steps:
- checkout:
Expand Down Expand Up @@ -397,7 +397,7 @@ jobs:
- src/ashley/static/ashley/font/*
lint-front:
docker:
- image: circleci/node:14
- image: cimg/node:18.18
working_directory: ~/fun/src/frontend
steps:
- checkout:
Expand All @@ -414,7 +414,7 @@ jobs:

test-front:
docker:
- image: circleci/node:14
- image: cimg/node:18.18
working_directory: ~/fun/src/frontend
steps:
- checkout:
Expand All @@ -430,7 +430,7 @@ jobs:

test-front-package:
docker:
- image: circleci/node:14
- image: cimg/node:18.18
working_directory: ~/wrk
steps:
- checkout:
Expand Down
4 changes: 1 addition & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
version: '3.4'

services:
postgresql:
image: postgres:12
image: postgres:13.16
env_file:
- env.d/development/postgresql
ports:
Expand Down