From 62c2be255d1e74b94a3d6bac7eed6a58a3b71bc1 Mon Sep 17 00:00:00 2001
From: mv-turtle <78047717+mv-turtle@users.noreply.github.com>
Date: Sun, 27 Nov 2022 22:32:15 -0500
Subject: [PATCH 1/3] Add a badge to README.md
---
README.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/README.md b/README.md
index 169d51509b..d819b1cd93 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,9 @@
+
+ 
+
From e18a44f723ab401fb5e3c3c40935a1c4d4651a46 Mon Sep 17 00:00:00 2001
From: Maidul Islam
Date: Sun, 27 Nov 2022 22:39:54 -0500
Subject: [PATCH 2/3] Delete linter.yml
---
.github/workflows/linter.yml | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 .github/workflows/linter.yml
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
deleted file mode 100644
index 49467cc862..0000000000
--- a/.github/workflows/linter.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-# name: Lint Code Base
-
-# on:
-# push:
-# branches-ignore: [main]
-# pull_request:
-# branches: [main]
-
-# jobs:
-# build:
-# name: Lint Code Base
-# runs-on: ubuntu-latest
-# steps:
-# - name: Checkout Code
-# uses: actions/checkout@v3
-# with:
-# fetch-depth: 0
-# - name: Lint Code Base
-# uses: github/super-linter@v4
-# env:
-# VALIDATE_ALL_CODEBASE: false
-# DEFAULT_BRANCH: main
-# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
From 0a9f4ffc4daa2ed4ec0b52e7dbaa60431587ca82 Mon Sep 17 00:00:00 2001
From: Tuan Dang
Date: Sun, 27 Nov 2022 23:36:50 -0500
Subject: [PATCH 3/3] Restructure docs around new anchors
---
docs/contributing/developing.mdx | 2 +-
.../dashboard/create-account.mdx | 19 +--
.../dashboard/integrations.mdx | 10 +-
.../dashboard/organization.mdx | 17 +-
docs/getting-started/dashboard/project.mdx | 10 +-
docs/getting-started/dashboard/token.mdx | 19 +--
docs/integrations/docker-compose.mdx | 12 +-
docs/integrations/docker.mdx | 24 +--
docs/integrations/overview.mdx | 2 +-
docs/mint.json | 153 ++++++++++--------
docs/self-hosting/deployments/linux.mdx | 2 +-
11 files changed, 129 insertions(+), 141 deletions(-)
diff --git a/docs/contributing/developing.mdx b/docs/contributing/developing.mdx
index cca804a9c4..b6c25861c0 100644
--- a/docs/contributing/developing.mdx
+++ b/docs/contributing/developing.mdx
@@ -16,7 +16,7 @@ cd infisical
## Set up environment variables
-Tweak the `.env` according to your preferences. Refer to the available [environment variables](envars).
+Tweak the `.env` according to your preferences. Refer to the available [environment variables](/self-hosting/configuration/envars).
```bash
cp .env.example .env
diff --git a/docs/getting-started/dashboard/create-account.mdx b/docs/getting-started/dashboard/create-account.mdx
index ea412c1e78..ddc1654e36 100644
--- a/docs/getting-started/dashboard/create-account.mdx
+++ b/docs/getting-started/dashboard/create-account.mdx
@@ -8,24 +8,7 @@ If you're using a self-hosted installation, follow the [setup](/self-hosting/ove
## Infisical Cloud
-**Step 1:** Open [infisical.com](https://infisical.com/) and click on either "Try Infisical for free" or "Start for free" to head to the signup sequence.
-
-
-
-**Step 2:** Fill out the signup sequence.
-
-
-
-
-
-You'll be prompted to fill out some required fields to set up your account.
-
-| Field | Description |
-| ---------- | --------------------------- |
-| Email | Enter a valid email address |
-| First name | Your first name |
-| Last name | Your last name |
-| Password | Password |
+Open [infisical.com](https://infisical.com/) and click on either "Try Infisical for free" or "Start for free" to complete the signup sequence.
Once you've done that, you'll be taken to the dashboard where we've populated some default environment variables for demonstration.
diff --git a/docs/getting-started/dashboard/integrations.mdx b/docs/getting-started/dashboard/integrations.mdx
index 193cde84b7..95541ca386 100644
--- a/docs/getting-started/dashboard/integrations.mdx
+++ b/docs/getting-started/dashboard/integrations.mdx
@@ -2,12 +2,10 @@
title: "Integrations"
---
-We’re still early with integrations but you’ll be able to sync environment variables across your entire infrastructure from local development to CI/CD and production.
+Integrations allow environment variables to be synced across your entire infrastructure from local development to CI/CD and production.
-
+We're still early with integrations, but expect more soon.
-Check out integrations:
+
-- [Heroku](/integrations/heroku)
-- [Docker](/integrations/docker)
-- [Docker Compose](/integrations/docker-compose)
+Check out our [integrations](/integrations/overview).
diff --git a/docs/getting-started/dashboard/organization.mdx b/docs/getting-started/dashboard/organization.mdx
index 7cbd642fe8..c58922daa8 100644
--- a/docs/getting-started/dashboard/organization.mdx
+++ b/docs/getting-started/dashboard/organization.mdx
@@ -2,15 +2,12 @@
title: "Organization"
---
-By default, Infisical creates an organization under your name such as "John's Organization." To make changes and add members to your organization, head to your organization settings.
+An organization houses projects and members.
-
+By default, Infisical creates an organization under your name. You can manage your organization in your organization settings.
-
-
-
-Feel free to change the name of your organization.
+
## Members
@@ -19,9 +16,12 @@ Members of an organization can create and add other members to projects within t
To add a member to your organization, scroll down to the "Organization Members" section and invite the member via email. They'll receive an email to confirm their organization invitation. If the member is an existing user on the platform, they will be automatically added to the organization.
-
-Note that access to projects must be provisioned to new members after they've accepted their invitation, and they will not be added to any projects by default.
+
+ Note that access to projects must be provisioned to new members after they've
+ accepted their organization invitation, and they will not be added to any
+ projects by default.
+
## Incident contacts
@@ -30,4 +30,3 @@ Incident contacts of an organization are alerted if anything abnormal is detecte
To add an incident contact to your organization, scroll down to the "Incident Contacts" section and add their email.
-
diff --git a/docs/getting-started/dashboard/project.mdx b/docs/getting-started/dashboard/project.mdx
index b385f09d81..aa64d635b4 100644
--- a/docs/getting-started/dashboard/project.mdx
+++ b/docs/getting-started/dashboard/project.mdx
@@ -2,7 +2,7 @@
title: "Project"
---
-A project houses environment variables for an application or service.
+A project houses environment variables for an application.
## Dashboard
@@ -33,20 +33,14 @@ Every environment variable is classified as either personal or shared.
You can toggle the classification of an environment variable by pressing on its settings:
-
-
-
-
### Search
You can search for any environment variable by its key.
-
-
### Sort
You can sort environment variables alphabetically by their keys.
@@ -59,8 +53,6 @@ You can hide or un-hide the values of your environment variables. By default, th
-
-
### Download as .env
You can download your environment variables back in a .env file.
diff --git a/docs/getting-started/dashboard/token.mdx b/docs/getting-started/dashboard/token.mdx
index 1215784179..5cde8d61d6 100644
--- a/docs/getting-started/dashboard/token.mdx
+++ b/docs/getting-started/dashboard/token.mdx
@@ -2,20 +2,15 @@
title: "Infisical Token"
---
-An Infisical Token is needed to authenticate the CLI when there isn't an easy way to manually type in your login credentials to sync environment variables to your applications.
+An Infisical Token is needed to authenticate the CLI when there isn't an easy way to input your login credentials.
-It grants read-only access to a particular environment and project for a specified amount of time.
+It's useful for the [Docker](/integrations/docker) and [Docker Compose](/integrations/docker-compose) integrations.
-This is useful in the following contexts:
-
-- [Docker](/integrations/docker)/[Docker-Compose](/integrations/docker-compose) integration: An Infisical Token can be passed to a Docker container as an environment variable for the CLI to authenticate and pull its corresponding secrets.
-
-## Generate an Infisical Token
-
-It's possible to generate an Infisical token in the settings of a project.
+It's possible to generate the token in the settings of a project.
-
-
-
+
+ The token grants read-only access to a particular environment and project for
+ a specified amount of time.
+
diff --git a/docs/integrations/docker-compose.mdx b/docs/integrations/docker-compose.mdx
index 97ce0aba07..133eba3780 100644
--- a/docs/integrations/docker-compose.mdx
+++ b/docs/integrations/docker-compose.mdx
@@ -2,11 +2,13 @@
title: "Docker Compose"
---
-### Step 1: Add CLI to your Dockerfile
+The Docker Compose integration enables you to inject environment variables from Infisical into the containers defined in your compose file.
-Follow steps 1 through 3 on our [guide to configure Infisical CLI](../getting-started/cli/installation) in your Dockerfile.
+## Add the CLI to your Dockerfile(s)
-### Step 2: Generate Infisical Token
+Follow steps 1 through 3 on our [guide to configure Infisical CLI](../integrations/docker) in your Dockerfile.
+
+## Generate Infisical Token
In order for Infisical CLI to authenticate and retrieve your project's secrets without exposing your login credentials, you must generate a Infisical Token.
To learn how, visit [Infisical Token](../getting-started/cli/infisical-token). Once you have generated the token, keep it handy.
@@ -16,7 +18,7 @@ To learn how, visit [Infisical Token](../getting-started/cli/infisical-token). O
have to generate a Infisical Token for each service.
-### Step 3: Tell Docker Compose your Infisical Token
+## Tell Docker Compose your Infisical Token
For each service you want to inject secrets into, set an environment variable called `INFISICAL_TOKEN` equal to a helpful identifier variable.
This will ensure that you can set Infisical Tokens for multiple services.
@@ -41,7 +43,7 @@ services:
- INFISICAL_TOKEN=${INFISICAL_TOKEN_FOR_API}
```
-### 4: Export shell variables
+## Export shell variables
Next, set the shell variables you defined in your compose file. This can be done manually or via your CI/CD environment. Once done, it will be used to populate the corresponding `INFISICAL_TOKEN`
in your Docker Compose file.
diff --git a/docs/integrations/docker.mdx b/docs/integrations/docker.mdx
index aad94ae6cf..3b03abea3b 100644
--- a/docs/integrations/docker.mdx
+++ b/docs/integrations/docker.mdx
@@ -2,7 +2,9 @@
title: "Docker"
---
-## Step 1: Add CLI to your Dockerfile
+The Docker integration enables you to inject environment variables from Infisical into a container.
+
+## Add the CLI to your Dockerfile
@@ -29,14 +31,10 @@ title: "Docker"
-## Step 2: Generate Infisical Token
-
-[Generate an Infisical Token](../../getting-started/dashboard/token) and keep it handy.
-
-## Step 3: Set start command of your container
+## Modify the start command in your Dockerfile
```dockerfile
-CMD ["infisical", "--env=[your-project-env-name]", "projectId=[your-project-id]", "run", "---", ""]
+CMD ["infisical", "--env=[env]", "projectId=[projectId]", "run", "---", "[your application start command]"]
# example
CMD ["infisical", "--env=prod", "projectId=62faf98ae0b05e83239b5da41", "run", "---", "npm run start"]
@@ -49,12 +47,14 @@ Required options:
| `--env` | Used to set the environment that secrets are pulled from. Accepted values: `dev`, `staging`, `test`, `prod` | `dev` |
| `--projectId` | Used to link a local project to the platform | `None` |
-## Step 4: Feed Docker your Infisical Token
+## Generate an Infisical Token
-The CLI looks out for an environment variable called the `INFISICAL_TOKEN` which you can set depending on where you run the CLI. If `INFISICAL_TOKEN` is detected by the CLI, it will authenticate and retrieve the environment variables which the token is authorized for.
+[Generate an Infisical Token](../../getting-started/dashboard/token) and keep it handy.
+
+## Feed Docker your Infisical Token
+
+The CLI looks out for an environment variable called `INFISICAL_TOKEN`. If the token is detected, the CLI will authenticate, retrieve, and inject the environment variables which the token is authorized for.
```bash
- docker run --env INFISICAL_TOKEN=[the-token-you-got-from-step-2]...
+ docker run --env INFISICAL_TOKEN=[token]...
```
-
-Note: `INFISICAL_TOKEN` is the token you generated in step 2.
diff --git a/docs/integrations/overview.mdx b/docs/integrations/overview.mdx
index 4f4a2db3ef..268f233194 100644
--- a/docs/integrations/overview.mdx
+++ b/docs/integrations/overview.mdx
@@ -2,7 +2,7 @@
title: "Overview"
---
-Integrations allow environment variables to be synced across your entire infrastructure from local development to CI/CD and production.
+Integrations allow environment variables to be synced from Infisical into your local development workflow, CI/CD pipelines, and production infrastructure.
Missing an integration? Throw in a [request](https://github.com/Infisical/infisical/issues).
diff --git a/docs/mint.json b/docs/mint.json
index baea4bbe31..4e203102aa 100644
--- a/docs/mint.json
+++ b/docs/mint.json
@@ -27,90 +27,109 @@
"url": "https://app.infisical.com/signup"
},
"anchors": [
+ {
+ "name": "Security",
+ "icon": "shield-halved",
+ "url": "security"
+ },
+ {
+ "name": "Self-hosting",
+ "icon": "server",
+ "url": "self-hosting"
+ },
+ {
+ "name": "Contributing",
+ "icon": "code",
+ "url": "contributing"
+ },
{
"name": "Blog",
"icon": "newspaper",
"url": "https://blog.infisical.com/"
+ },
+ {
+ "name": "Slack",
+ "icon": "slack",
+ "url": "https://join.slack.com/t/infisical-users/shared_invite/zt-1kovn1q6p-p5fvJo7o083naouDkOzgZQ"
+ },
+ {
+ "name": "GitHub",
+ "icon": "github",
+ "url": "https://github.com/Infisical/infisical"
}
],
"navigation": [
{
- "group": " ",
+ "group": "Overview",
"pages": [
+ "getting-started/introduction",
+ "getting-started/quickstart",
+ "getting-started/features"
+ ]
+ },
+ {
+ "group": "Platform",
+ "pages": [
+ "getting-started/dashboard/organization",
+ "getting-started/dashboard/project",
+ "getting-started/dashboard/integrations",
+ "getting-started/dashboard/token"
+ ]
+ },
+ {
+ "group": "CLI",
+ "pages": [
+ "cli/overview",
+ "cli/usage",
{
- "group": "Overview",
- "pages": [
- "getting-started/introduction",
- "getting-started/quickstart",
- "getting-started/features"
- ]
- },
- {
- "group": "Security",
- "pages": [
- "security/overview",
- "security/data-model",
- "security/mechanics"
- ]
- },
- {
- "group": "Web UI",
- "pages": [
- "getting-started/dashboard/create-account",
- "getting-started/dashboard/organization",
- "getting-started/dashboard/project",
- "getting-started/dashboard/integrations",
- "getting-started/dashboard/token"
- ]
- },
- {
- "group": "CLI",
- "pages": [
- "cli/overview",
- "cli/usage",
- {
- "group": "Reference",
- "pages": [
- "cli/reference/commands",
- "cli/reference/login",
- "cli/reference/init",
- "cli/reference/run"
- ]
- }
- ]
- },
- {
- "group": "Integrations",
+ "group": "Reference",
"pages": [
- "integrations/overview",
- "integrations/heroku",
- "integrations/docker",
- "integrations/docker-compose"
+ "cli/reference/commands",
+ "cli/reference/login",
+ "cli/reference/init",
+ "cli/reference/run"
]
- },
+ }
+ ]
+ },
+ {
+ "group": "Integrations",
+ "pages": [
+ "integrations/overview",
+ "integrations/heroku",
+ "integrations/docker",
+ "integrations/docker-compose"
+ ]
+ },
+ {
+ "group": "Self-hosting",
+ "pages": [
+ "self-hosting/overview",
{
- "group": "Self-hosting",
- "pages": [
- "self-hosting/overview",
- {
- "group": "Deployments",
- "pages": ["self-hosting/deployments/linux"]
- },
- {
- "group": "Configuration",
- "pages": ["self-hosting/configuration/envars"]
- }
- ]
+ "group": "Deployments",
+ "pages": ["self-hosting/deployments/linux"]
},
{
- "group": "Contributing",
- "pages": [
- "contributing/overview",
- "contributing/code-of-conduct",
- "contributing/developing"
- ]
+ "group": "Configuration",
+ "pages": ["self-hosting/configuration/envars"]
}
]
+ },
+ {
+ "group": "Security",
+ "pages": [
+ "security/overview",
+ "security/data-model",
+ "security/mechanics"
+ ]
+ },
+ {
+ "group": "Contributing",
+ "pages": [
+ "contributing/overview",
+ "contributing/code-of-conduct",
+ "contributing/developing"
+ ]
}
],
"backgroundImage": "/images/background.png"
diff --git a/docs/self-hosting/deployments/linux.mdx b/docs/self-hosting/deployments/linux.mdx
index e3392e6c39..0282e46dee 100644
--- a/docs/self-hosting/deployments/linux.mdx
+++ b/docs/self-hosting/deployments/linux.mdx
@@ -51,4 +51,4 @@ nano .env
docker-compose -f docker-compose.yml up -d
```
-5. Your Infisical installation is complete and should be running on port 8080. Please note that the containers are not exposed to the internet and only bind to the localhost. It's up to you to configure a firewall, SSL certificates, and implement any additional security measures.
+5. Your Infisical installation is complete and should be running on [http://localhost:8080](http://localhost:8080). Please note that the containers are not exposed to the internet and only bind to the localhost. It's up to you to configure a firewall, SSL certificates, and implement any additional security measures.