Skip to content
This repository was archived by the owner on Sep 6, 2024. It is now read-only.

Commit 4e75c33

Browse files
author
Michael Rosabal
authored
Merge branch 'master' into telegraf_custom
2 parents a93b43b + f084089 commit 4e75c33

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1903
-232
lines changed

.circleci/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ jobs:
9292
set -exu
9393
mkdir -p /tmp/workspace/js
9494
mv /tmp/workspace/js/ jekyll/assets/js/dist/
95+
- run:
96+
name: Shim untranslated Japanese pages
97+
command: ./scripts/shim-translation.sh jekyll/_cci2 jekyll/_cci2_ja
9598
- run:
9699
name: Build the Jekyll site
97100
command: bundle exec jekyll build --config jekyll/_config.yml,jekyll/_config_production.yml --source jekyll --destination jekyll/_site/docs/ 2>&1 | tee $JOB_RESULTS_PATH/build-results.txt

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
_site/
88
jekyll/.jekyll-cache/
99
jekyll/environments/
10-
jekyll/assets/js/dist/
1110
jekyll/_includes/app.html
1211
run-results/
1312
node_modules/

jekyll/_cci2/admin-faq.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ published: true
1212

1313
#### Can I monitor available build containers?
1414

15-
Yes, refer to the Introduction to Nomad Cluster Operation document for details. Refer to the [Administrative Variables, Monitoring, and Logging]({{site.baseurl}}/2.0/monitoring/) document for how to enable additional container monitoring for AWS.
15+
Yes, refer to the [Introduction to Nomad Cluster Operation]({{site.baseurl}}/2.0/nomad) document for details. Refer to the [Administrative Variables, Monitoring, and Logging]({{site.baseurl}}/2.0/monitoring/) document for how to enable additional container monitoring for AWS.
1616

1717
#### How do I provision admin users?
1818

@@ -45,7 +45,7 @@ New Nomad Clients joining the fleet will use the new passphrase. Existing Nomad
4545

4646
#### How can I gracefully shutdown a Nomad Clients?
4747

48-
Refer to the Introduction to Nomad Cluster Operation document for details.
48+
Refer to the [Introduction to Nomad Cluster Operation]({{site.baseurl}}/2.0/nomad) document for details.
4949

5050
#### Is it possible to run iOS/macOS builds on CircleCI?
5151

@@ -66,7 +66,7 @@ We set the services box to have termination protection in AWS. We also write to
6666

6767
#### Do the builders store any state?
6868

69-
They can be torn down without worry as they don't persist any data.
69+
They can be torn down without worry as they don't persist any data.
7070

7171

7272
#### How do I verify TLS settings are failing?
@@ -137,7 +137,7 @@ Replicated starts many Docker containers to run CCIE, so it may be useful to che
137137
You should see something similar to this output:
138138

139139
```
140-
sudo docker ps
140+
$ sudo docker ps
141141
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
142142
03fb873adf26 <service-box-ip>:9874/circleci-frontend:0.1.149242-d650d3c "/docker-entrypoint.s" 3 days ago Up 3 days 0.0.0.0:80->80/tcp, 0.0.0.0:443->443/tcp, 0.0.0.0:4434->4434/tcp e53e4f74259a6ec0a268d8c984ac6277
143143
113b9ea03b46 <service-box-ip>:9874/circleci-slanger:0.4 "/docker-entrypoint.s" 3 days ago Up 3 days 0.0.0.0:4567->4567/tcp, 0.0.0.0:8081->8080/tcp d262cc492bd5d692d467f74d8cc39748

jekyll/_cci2/api-job-trigger.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,16 @@ and refers to the name of your branch.
4545
For a complete reference of the API,
4646
see the [CircleCI API Documentation]({{ site.baseurl }}/api/v1-reference/).
4747

48-
**Note:**
49-
It is possible to trigger [workflows]({{ site.baseurl }}/2.0/workflows/) with the CircleCI API, using a new endpoint, see the Trigger a Build by Project section of the [CircleCI API Projects Documentation]({{ site.baseurl }}/api/v1-reference/#new-project-build).
50-
51-
Jobs triggered with the API may contain a `workflows` section.
52-
These workflows do **not** have to reference the job
53-
you trigger with the API.
54-
Jobs triggered with the API do **not** have access to environment variables
55-
created for [a CircleCI Context]({{ site.baseurl }}/2.0/contexts/).
56-
Instead, define these variables at the [Project level]({{ site.baseurl }}/2.0/env-vars/#setting-an-environment-variable-in-a-project).
48+
**Important Considerations When Triggering A Job Via The API**
49+
50+
- Jobs triggered with the API may contain a `workflows` section
51+
- Your workflow does **not** have to reference the job you triggered with the API
52+
- Jobs that are triggered via the API do **not** have access to environment
53+
variables created for [a CircleCI Context]({{ site.baseurl }}/2.0/contexts/)
54+
- If you wish to use environment variables they have to be defined at the [Project level]({{ site.baseurl }}/2.0/env-vars/#setting-an-environment-variable-in-a-project)
55+
- It is currently not possible to trigger a single job if you are using CircleCI 2.1 and Workflows
56+
- It is possible to trigger [workflows]({{ site.baseurl }}/2.0/workflows/) with the CircleCI API, using the [Trigger a Build by Project]({{ site.baseurl}}/api/v1-reference/#new-project-build) endpoint
57+
5758

5859
## Conditionally Running Jobs With the API
5960

jekyll/_cci2/archive.md

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ sitemap: false
1010

1111
## Getting Started
1212
- [Introduction to CircleCI]({{ site.baseurl }}/archive/introduction/){:rel="nofollow"}
13-
- [Getting Started with CircleCI archive]({{ site.baseurl }}/archive/getting-started/){:rel="nofollow"}
13+
- [Getting Started with CircleCI 1.0]({{ site.baseurl }}/archive/getting-started/){:rel="nofollow"}
1414
- [FAQ]({{ site.baseurl }}/archive/faq/){:rel="nofollow"}
1515

1616
## Migration
17-
- [Sample archive circle.yml file]({{ site.baseurl }}/archive/config-sample/){:rel="nofollow"}
17+
- [Sample 1.0 circle.yml file]({{ site.baseurl }}/archive/config-sample/){:rel="nofollow"}
1818
- [GitHub Integration (5)]({{ site.baseurl }}/archive/github-privacy/){:rel="nofollow"}
1919
- [Migrating from Jenkins to CircleCI]({{ site.baseurl }}/archive/migrating-from-jenkins/){:rel="nofollow"}
2020

@@ -39,15 +39,15 @@ sitemap: false
3939

4040
## Configuration
4141
- [Overview]({{ site.baseurl }}/archive/manually/){:rel="nofollow"}
42-
- [Configuring CircleCI archive]({{ site.baseurl }}/archive/configuration/){:rel="nofollow"}
43-
- [Using CircleCI archive Environment Variables]({{ site.baseurl }}/archive/environment-variables/){:rel="nofollow"}
42+
- [Configuring CircleCI 1.0]({{ site.baseurl }}/archive/configuration/){:rel="nofollow"}
43+
- [Using CircleCI 1.0 Environment Variables]({{ site.baseurl }}/archive/environment-variables/){:rel="nofollow"}
4444
- [Activating Web Notifications]({{ site.baseurl }}/archive/web-notifications/){:rel="nofollow"}
45-
- [CircleCI archive Collecting Test Metadata]({{ site.baseurl }}/archive/test-metadata/){:rel="nofollow"}
45+
- [CircleCI 1.0 Collecting Test Metadata]({{ site.baseurl }}/archive/test-metadata/){:rel="nofollow"}
4646
- [Generating Code Coverage Metrics]({{ site.baseurl }}/archive/code-coverage/){:rel="nofollow"}
4747
- [Starting Background Processes]({{ site.baseurl }}/archive/background-process/){:rel="nofollow"}
4848
- [Using Resources External to Your Repository]({{ site.baseurl }}/archive/external-resources/){:rel="nofollow"}
4949
- [Skip code which should not run on your CI server]({{ site.baseurl }}/archive/dont-run/){:rel="nofollow"}
50-
- [CircleCI archive Skipping a build]({{ site.baseurl }}/archive/skip-a-build/){:rel="nofollow"}
50+
- [CircleCI 1.0 Skipping a build]({{ site.baseurl }}/archive/skip-a-build/){:rel="nofollow"}
5151
- [Setting Up iOS applications on CircleCI]({{ site.baseurl }}/archive/ios-getting-started/){:rel="nofollow"}
5252
- [Testing iOS Applications on macOS]({{ site.baseurl }}/archive/ios-builds-on-os-x/){:rel="nofollow"}
5353
- [iOS code signing]({{ site.baseurl }}/archive/ios-code-signing/){:rel="nofollow"}
@@ -62,14 +62,14 @@ sitemap: false
6262
- [Upload to Artifactory]({{ site.baseurl }}/archive/Artifactory/){:rel="nofollow"}
6363
- [Test with Sauce Labs]({{ site.baseurl }}/archive/browser-testing-with-sauce-labs/){:rel="nofollow"}
6464
- [Continuous Deployment with Amazon S3]({{ site.baseurl }}/archive/continuous-deployment-with-amazon-s3/){:rel="nofollow"}
65-
- [CircleCI archive Continuous Deployment with AWS CodeDeploy]({{ site.baseurl }}/archive/continuous-deployment-with-aws-codedeploy/){:rel="nofollow"}
65+
- [CircleCI 1.0 Continuous Deployment with AWS CodeDeploy]({{ site.baseurl }}/archive/continuous-deployment-with-aws-codedeploy/){:rel="nofollow"}
6666
- [Continuous Deployment with AWS ECS]({{ site.baseurl }}/archive/continuous-deployment-with-aws-ec2-container-service/){:rel="nofollow"}
6767
- [Continuous Deployment with GKE]({{ site.baseurl }}/archive/continuous-deployment-with-google-container-engine/){:rel="nofollow"}
6868
- [Continuous Deployment with Heroku]({{ site.baseurl }}/archive/continuous-deployment-with-heroku/){:rel="nofollow"}
6969
- [Continuous Deployment with Ninefold]({{ site.baseurl }}/archive/continuous-deployment-with-ninefold/){:rel="nofollow"}
7070
- [Continuous Deployment to IBM Bluemix and Pivotal Web Service]({{ site.baseurl }}/archive/deploy-bluemix/){:rel="nofollow"}
7171
- [Continuous Deployment to Google App Engine]({{ site.baseurl }}/archive/deploy-google-app-engine/){:rel="nofollow"}
72-
- [CircleCI archive Continuous Integration and Delivery with Docker]({{ site.baseurl }}/archive/docker/){:rel="nofollow"}
72+
- [CircleCI 1.0 Continuous Integration and Delivery with Docker]({{ site.baseurl }}/archive/docker/){:rel="nofollow"}
7373
- [Testing with Firebase Test Lab]({{ site.baseurl }}/archive/firebase-test-lab/){:rel="nofollow"}
7474
- [Authentication with Google Cloud Platform]({{ site.baseurl }}/archive/google-auth/){:rel="nofollow"}
7575
- [Deploying to Google Cloud Platform]({{ site.baseurl }}/archive/google-cloud-platform/){:rel="nofollow"}
@@ -95,7 +95,7 @@ sitemap: false
9595
- [File-ordering bugs on Linux systems]({{ site.baseurl }}/archive/file-ordering/){:rel="nofollow"}
9696
- [Filesystem layout problems (2)]({{ site.baseurl }}/archive/filesystem/){:rel="nofollow"}
9797
- [Your build hit the 4G memory limit]({{ site.baseurl }}/archive/oom/){:rel="nofollow"}
98-
- [CircleCI archive SSH access to builds]({{ site.baseurl }}/archive/ssh-build/){:rel="nofollow"}
98+
- [CircleCI 1.0 SSH access to builds]({{ site.baseurl }}/archive/ssh-build/){:rel="nofollow"}
9999
- [Time-based results are one day off]({{ site.baseurl }}/archive/time-day/){:rel="nofollow"}
100100
- [Browsers (2)]({{ site.baseurl }}/archive/troubleshooting-browsers/){:rel="nofollow"}
101101
- [Clojure (1)]({{ site.baseurl }}/archive/troubleshooting-clojure/){:rel="nofollow"}
@@ -107,3 +107,28 @@ sitemap: false
107107
- [PHP (2)]({{ site.baseurl }}/archive/troubleshooting-php/){:rel="nofollow"}
108108
- [Python (1)]({{ site.baseurl }}/archive/troubleshooting-python/){:rel="nofollow"}
109109
- [Ruby (10)]({{ site.baseurl }}/archive/troubleshooting-ruby/){:rel="nofollow"}
110+
111+
## Enterprise Administration
112+
113+
- [Installation]({{ site.baseurl }}/enterprise/aws/){:rel="nofollow"}
114+
- [Backup]({{ site.baseurl }}/enterprise/backup/){:rel="nofollow"}
115+
- [Cloudwatch]({{ site.baseurl }}/enterprise/cloudwatch/){:rel="nofollow"}
116+
- [Configuration]({{ site.baseurl }}/enterprise/config/){:rel="nofollow"}
117+
- [Certificates]({{ site.baseurl }}/enterprise/custom-ca/){:rel="nofollow"}
118+
- [Debugging Replicated]({{ site.baseurl }}/enterprise/debugging-replicated/){:rel="nofollow"}
119+
- [Differences from Cloud]({{ site.baseurl }}/enterprise/differences/){:rel="nofollow"}
120+
- [Docker Builder Configuration]({{ site.baseurl }}/enterprise/docker-builder-config/){:rel="nofollow"}
121+
- [Docker]({{ site.baseurl }}/enterprise/docker/){:rel="nofollow"}
122+
- [Exporting and Importing Projects]({{ site.baseurl }}/enterprise/export-import-projects/){:rel="nofollow"}
123+
- [Admin FAQ]({{ site.baseurl }}/enterprise/faq/){:rel="nofollow"}
124+
- [GPU Configuration]({{ site.baseurl }}/enterprise/gpu-configuration/){:rel="nofollow"}
125+
- [HA]({{ site.baseurl }}/enterprise/high-availability/){:rel="nofollow"}
126+
- [iOS Installation]({{ site.baseurl }}/enterprise/ios-install/){:rel="nofollow"}
127+
- [Logging]({{ site.baseurl }}/enterprise/logging/){:rel="nofollow"}
128+
- [Overview]({{ site.baseurl }}/enterprise/overview/){:rel="nofollow"}
129+
- [Proxy Configuration]({{ site.baseurl }}/enterprise/proxy/){:rel="nofollow"}
130+
- [Quick Start]({{ site.baseurl }}/enterprise/quick-start/){:rel="nofollow"}
131+
- [Security]({{ site.baseurl }}/enterprise/security/){:rel="nofollow"}
132+
- [Self Signing]({{ site.baseurl }}/enterprise/self-signed/){:rel="nofollow"}
133+
- [Single-Box Installation]({{ site.baseurl }}/enterprise/single-box/){:rel="nofollow"}
134+
- [Troubleshooting]({{ site.baseurl }}/enterprise/troubleshooting-install/){:rel="nofollow"}

jekyll/_cci2/authentication.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
2-
layout: classic-docs
3-
title: "Authentication"
4-
short-title: "Authentication"
5-
description: "Configuring LDAP Authentication"
6-
categories: [administration]
7-
order: 9
2+
layout: classic-docs
3+
title: "Authentication"
4+
short-title: "Authentication"
5+
description: "Configuring LDAP Authentication"
6+
categories: [administration]
7+
order: 9
88
---
99

1010
This document describes how to enable, configure, and test CircleCI to authenticate users with OpenLDAP or Active Directory credentials.

jekyll/_cci2/building-docker-images.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ jobs:
2727
2828
When `setup_remote_docker` executes, a remote environment will be created, and your current [primary container][primary-container] will be configured to use it. Then, any docker-related commands you use will be safely executed in this new environment.
2929

30-
**Note:** `setup_remote_docker` is not currently compatible with the `machine` or the `macos` executors.
30+
**Note:** The use of the `setup_remote_docker` key is reserved for configs in
31+
which your primary executor _is_ a docker container. If your executor is
32+
`machine` or `macos` (and you want to use docker commands in your config) you do not need to use the `setup_remote_docker` key.
3133

3234
### Specifications
3335
{:.no_toc}

0 commit comments

Comments
 (0)