Skip to content

Commit 72fe3a3

Browse files
authored
Merge pull request #2983 from StoDevX/circle-extract-docker-configurations
Circle: Extract Docker image selectors using anchors (and update Ruby Docker image to 2.5.1)
2 parents c1d103e + 218a498 commit 72fe3a3

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

.circleci/config.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
version: 2
33

44
x-config:
5+
x-images:
6+
- &docker-node
7+
- image: 'circleci/node:8'
8+
- &docker-ruby
9+
- image: 'circleci/ruby:2.5.1'
510
x-caching: # caching instructions
611
- &save-cache-yarn
712
key: 'v3-yarn-dependencies-{{ arch }}-{{ checksum "yarn.lock" }}'
@@ -103,7 +108,7 @@ workflows:
103108

104109
jobs:
105110
cache-yarn-linux:
106-
docker: [{image: 'circleci/node:8'}]
111+
docker: *docker-node
107112
steps:
108113
- checkout
109114
- restore_cache: *restore-cache-yarn
@@ -113,7 +118,7 @@ jobs:
113118
- persist_to_workspace: *persist-workspace-node_modules
114119

115120
cache-bundler-linux:
116-
docker: [{image: 'circleci/ruby:2.4'}]
121+
docker: *docker-ruby
117122
steps:
118123
- checkout
119124
- run: *set-ruby-version
@@ -125,7 +130,7 @@ jobs:
125130
- save_cache: *save-cache-bundler
126131

127132
danger:
128-
docker: [{image: 'circleci/node:8'}]
133+
docker: *docker-node
129134
environment:
130135
task: JS-general
131136
steps:
@@ -134,7 +139,7 @@ jobs:
134139
- run: *run-danger
135140

136141
flow:
137-
docker: [{image: 'circleci/node:8'}]
142+
docker: *docker-node
138143
environment:
139144
task: JS-flow
140145
steps:
@@ -146,7 +151,7 @@ jobs:
146151
- run: *run-danger
147152

148153
jest:
149-
docker: [{image: 'circleci/node:8'}]
154+
docker: *docker-node
150155
environment:
151156
task: JS-jest
152157
JEST_JUNIT_OUTPUT: ./test-results/jest/junit.xml
@@ -171,7 +176,7 @@ jobs:
171176
fi
172177
173178
prettier:
174-
docker: [{image: 'circleci/node:8'}]
179+
docker: *docker-node
175180
environment:
176181
task: JS-prettier
177182
steps:
@@ -189,7 +194,7 @@ jobs:
189194
- run: *run-danger
190195

191196
eslint:
192-
docker: [{image: 'circleci/node:8'}]
197+
docker: *docker-node
193198
environment:
194199
task: JS-lint
195200
steps:
@@ -204,7 +209,7 @@ jobs:
204209
path: ./test-results
205210

206211
data:
207-
docker: [{image: 'circleci/node:8'}]
212+
docker: *docker-node
208213
environment:
209214
task: JS-data
210215
steps:
@@ -260,7 +265,7 @@ jobs:
260265
IS_NIGHTLY: '1'
261266

262267
android-bundle:
263-
docker: [{image: 'circleci/node:8'}]
268+
docker: *docker-node
264269
environment:
265270
task: JS-bundle-android
266271
steps:
@@ -323,7 +328,7 @@ jobs:
323328
IS_NIGHTLY: '1'
324329

325330
ios-bundle:
326-
docker: [{image: 'circleci/node:8'}]
331+
docker: *docker-node
327332
environment:
328333
task: JS-bundle-ios
329334
steps:

0 commit comments

Comments
 (0)