Skip to content

Commit 69aaf1f

Browse files
committed
To resolving merge conflict on previous pull request
1 parent 323c054 commit 69aaf1f

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

.circleci/config.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ jobs:
44
working_directory: ~/project
55
docker:
66
- image: starefossen/ruby-node:2-8
7+
auth:
8+
username: intelexdocker
9+
password: $DOCKERHUB_PASSWORD
710
steps:
811
- checkout
912
- run:
@@ -22,6 +25,9 @@ jobs:
2225
working_directory: ~/project
2326
docker:
2427
- image: starefossen/ruby-node:2-8
28+
auth:
29+
username: intelexdocker
30+
password: $DOCKERHUB_PASSWORD
2531
steps:
2632
- checkout
2733
- add_ssh_keys:
@@ -42,8 +48,12 @@ workflows:
4248
version: 2
4349
build-and-deploy:
4450
jobs:
45-
- build
51+
- build:
52+
context:
53+
- docker-hub
4654
- deploy:
55+
context:
56+
- docker-hub
4757
filters:
4858
branches:
4959
only: master

0 commit comments

Comments
 (0)