Skip to content

Commit 70201a6

Browse files
committed
Fix setup.
1 parent 9ae0d79 commit 70201a6

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
- run:
110110
name: Login to Docker Hub
111111
command: |
112-
echo "$DOCKERHUB_PASSWORD" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
112+
echo "$DOCKER_HUB_PASSWORD" | docker login -u "$DOCKER_HUB_USER" --password-stdin
113113
114114
# Build base images
115115
- run:
@@ -149,5 +149,5 @@ workflows:
149149
when: << pipeline.parameters.rebuild_base_images >>
150150
jobs:
151151
- rebuild-base-images:
152-
context: dockerhub-credentials
152+
context: docker-hub
153153

DOCKER_HUB_SETUP.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Docker Hub Setup for CircleCI
22

3-
Note: Max Neunhöffer has done the following to setup image pushing
4-
using the `neunhoef` account to produce an access token.
3+
Note: The following has been done for the `releasebot` user on Docker hub.
54

65
## Overview
76

@@ -28,19 +27,19 @@ The `rebuild-base-images-manual` workflow in CircleCI requires Docker Hub creden
2827
2. Click on **Organization Settings** in the left sidebar
2928
3. Click on **Contexts**
3029
4. Click **Create Context**
31-
5. Name it exactly: `dockerhub-credentials` (this matches the context referenced in the workflow)
30+
5. Name it exactly: `docker-hub` (this matches the context referenced in the workflow)
3231
6. Click **Create Context**
3332

3433
### Step 3: Add Environment Variables to the Context
3534

36-
1. Click on the `dockerhub-credentials` context you just created
35+
1. Click on the `docker-hub` context you just created
3736
2. Click **Add Environment Variable**
3837
3. Add the first variable:
39-
- **Name**: `DOCKERHUB_USERNAME`
38+
- **Name**: `DOCKER_HUB_USER`
4039
- **Value**: Your Docker Hub username (must have push access to the `arangodb` organization)
4140
- Click **Add Environment Variable**
4241
4. Add the second variable:
43-
- **Name**: `DOCKERHUB_PASSWORD`
42+
- **Name**: `DOCKER_HUB_PASSWORD`
4443
- **Value**: The access token you created in Step 1 (paste the token here)
4544
- Click **Add Environment Variable**
4645

@@ -117,11 +116,11 @@ This means your Docker Hub account doesn't have push access to the `arangodb` or
117116

118117
This is usually a transient Docker login issue. Re-run the workflow.
119118

120-
### "DOCKERHUB_USERNAME or DOCKERHUB_PASSWORD not set"
119+
### "DOCKER_HUB_USER or DOCKER_HUB_PASSWORD not set"
121120

122121
Make sure:
123-
1. The context name is exactly `dockerhub-credentials`
124-
2. The environment variables are named exactly `DOCKERHUB_USERNAME` and `DOCKERHUB_PASSWORD`
122+
1. The context name is exactly `docker-hub`
123+
2. The environment variables are named exactly `DOCKER_HUB_USER` and `DOCKER_HUB_PASSWORD`
125124
3. Your CircleCI project has access to the context (check Context > Settings > Security)
126125

127126
## Security Notes

0 commit comments

Comments
 (0)