Skip to content

Commit e9a91cb

Browse files
normana10normana10
committed
Merge branch 'main' into configurable-openid-connect-text
# Conflicts: # cli/deployment/config.go # cli/server.go # cli/testdata/coder_server_--help.golden # coderd/coderd.go # coderd/userauth.go # codersdk/deploymentconfig.go # site/src/api/typesGenerated.ts
2 parents 410fc98 + 70fd786 commit e9a91cb

File tree

611 files changed

+56722
-7744
lines changed

Some content is hidden

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

611 files changed

+56722
-7744
lines changed

‎.devcontainer/Dockerfile

+33-33
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@ ENV EDITOR=vim
66
RUN apt-get update && apt-get upgrade --yes
77

88
RUN apt-get install --yes \
9-
ca-certificates \
10-
bash-completion \
11-
build-essential \
12-
curl \
13-
cmake \
14-
direnv \
15-
emacs-nox \
16-
gnupg \
17-
htop \
18-
jq \
19-
less \
20-
lsb-release \
21-
lsof \
22-
man-db \
23-
nano \
24-
neovim \
25-
ssl-cert \
26-
sudo \
27-
unzip \
28-
xz-utils \
29-
zip
9+
ca-certificates \
10+
bash-completion \
11+
build-essential \
12+
curl \
13+
cmake \
14+
direnv \
15+
emacs-nox \
16+
gnupg \
17+
htop \
18+
jq \
19+
less \
20+
lsb-release \
21+
lsof \
22+
man-db \
23+
nano \
24+
neovim \
25+
ssl-cert \
26+
sudo \
27+
unzip \
28+
xz-utils \
29+
zip
3030

3131
# configure locales to UTF8
3232
RUN apt-get install locales && locale-gen en_US.UTF-8
@@ -39,22 +39,22 @@ RUN direnv hook bash >> $HOME/.bashrc
3939
RUN sh <(curl -L https://nixos.org/nix/install) --daemon
4040

4141
RUN mkdir -p $HOME/.config/nix $HOME/.config/nixpkgs \
42-
&& echo 'sandbox = false' >> $HOME/.config/nix/nix.conf \
43-
&& echo '{ allowUnfree = true; }' >> $HOME/.config/nixpkgs/config.nix \
44-
&& echo '. $HOME/.nix-profile/etc/profile.d/nix.sh' >> $HOME/.bashrc
42+
&& echo 'sandbox = false' >> $HOME/.config/nix/nix.conf \
43+
&& echo '{ allowUnfree = true; }' >> $HOME/.config/nixpkgs/config.nix \
44+
&& echo '. $HOME/.nix-profile/etc/profile.d/nix.sh' >> $HOME/.bashrc
4545

4646

4747
# install docker and configure daemon to use vfs as GitHub codespaces requires vfs
4848
# https://github.com/moby/moby/issues/13742#issuecomment-725197223
4949
RUN mkdir -p /etc/apt/keyrings \
50-
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
51-
&& echo \
52-
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
53-
$(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null \
54-
&& apt-get update \
55-
&& apt-get install --yes docker-ce docker-ce-cli containerd.io docker-compose-plugin \
56-
&& mkdir -p /etc/docker \
57-
&& echo '{"cgroup-parent":"/actions_job","storage-driver":"vfs"}' >> /etc/docker/daemon.json
50+
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
51+
&& echo \
52+
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
53+
$(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null \
54+
&& apt-get update \
55+
&& apt-get install --yes docker-ce docker-ce-cli containerd.io docker-compose-plugin \
56+
&& mkdir -p /etc/docker \
57+
&& echo '{"cgroup-parent":"/actions_job","storage-driver":"vfs"}' >> /etc/docker/daemon.json
5858

5959
# install golang and language tooling
6060
ENV GO_VERSION=1.19
@@ -67,6 +67,7 @@ RUN echo 'export PATH=$GOPATH/bin:$PATH' >> $HOME/.bashrc
6767
RUN bash -c ". $HOME/.bashrc \
6868
go install -v golang.org/x/tools/gopls@latest \
6969
&& go install -v mvdan.cc/sh/v3/cmd/shfmt@latest \
70+
&& go install -v github.com/mikefarah/yq/v4@v4.30.6 \
7071
"
7172

7273
# install nodejs
@@ -80,4 +81,3 @@ RUN bash -c "$(curl -fsSL https://raw.githubusercontent.com/horta/zstd.install/m
8081
RUN echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | sudo tee /etc/apt/sources.list.d/goreleaser.list \
8182
&& apt update \
8283
&& apt install nfpm
83-

‎.devcontainer/devcontainer.json

+17-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
// For format details, see https://aka.ms/devcontainer.json
22
{
3-
"name": "Development environments on your infrastructure",
3+
"name": "Development environments on your infrastructure",
44

5-
// Sets the run context to one level up instead of the .devcontainer folder.
6-
"context": ".",
5+
// Sets the run context to one level up instead of the .devcontainer folder.
6+
"context": ".",
77

8-
// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
9-
"dockerFile": "Dockerfile",
8+
// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
9+
"dockerFile": "Dockerfile",
1010

11-
// Use 'forwardPorts' to make a list of ports inside the container available locally.
12-
// "forwardPorts": [],
13-
14-
"postStartCommand": "dockerd",
11+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
12+
// "forwardPorts": [],
1513

16-
// privileged is required by GitHub codespaces - https://github.com/microsoft/vscode-dev-containers/issues/727
17-
"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined", "--privileged", "--init" ]
14+
"postStartCommand": "dockerd",
15+
16+
// privileged is required by GitHub codespaces - https://github.com/microsoft/vscode-dev-containers/issues/727
17+
"runArgs": [
18+
"--cap-add=SYS_PTRACE",
19+
"--security-opt",
20+
"seccomp=unconfined",
21+
"--privileged",
22+
"--init"
23+
]
1824
}

‎.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ trim_trailing_whitespace = true
77
insert_final_newline = true
88
indent_style = tab
99

10-
[*.{md,json,yaml,yml,tf,tfvars}]
10+
[*.{md,json,yaml,yml,tf,tfvars,nix}]
1111
indent_style = space
1212
indent_size = 2
1313

‎.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Generated files
2+
coderd/apidoc/docs.go linguist-generated=true
3+
coderd/apidoc/swagger.json linguist-generated=true
24
coderd/database/dump.sql linguist-generated=true
35
peerbroker/proto/*.go linguist-generated=true
46
provisionerd/proto/*.go linguist-generated=true

‎.github/dependabot.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ updates:
3838
# Ignore patch updates for all dependencies
3939
- dependency-name: "*"
4040
update-types:
41-
- version-update:semver-patch
41+
- version-update:semver-patch
4242

4343
- package-ecosystem: "npm"
4444
directory: "/site/"
@@ -53,7 +53,7 @@ updates:
5353
# Ignore patch updates for all dependencies
5454
- dependency-name: "*"
5555
update-types:
56-
- version-update:semver-patch
56+
- version-update:semver-patch
5757
# Ignore major updates to Node.js types, because they need to
5858
# correspond to the Node.js engine version
5959
- dependency-name: "@types/node"

‎.github/semantic.yaml

-56
This file was deleted.

‎.github/workflows/cla.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
issue_comment:
44
types: [created]
55
pull_request_target:
6-
types: [opened,closed,synchronize]
6+
types: [opened, closed, synchronize]
77

88
jobs:
99
CLAssistant:
@@ -15,12 +15,12 @@ jobs:
1515
env:
1616
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1717
# the below token should have repo scope and must be manually added by you in the repository's secret
18-
PERSONAL_ACCESS_TOKEN : ${{ secrets.CDRCOMMUNITY_GITHUB_TOKEN }}
18+
PERSONAL_ACCESS_TOKEN: ${{ secrets.CDRCOMMUNITY_GITHUB_TOKEN }}
1919
with:
20-
remote-organization-name: 'coder'
21-
remote-repository-name: 'cla'
22-
path-to-signatures: 'v2022-09-04/signatures.json'
23-
path-to-document: 'https://github.com/coder/cla/blob/main/README.md'
20+
remote-organization-name: "coder"
21+
remote-repository-name: "cla"
22+
path-to-signatures: "v2022-09-04/signatures.json"
23+
path-to-document: "https://github.com/coder/cla/blob/main/README.md"
2424
# branch should not be protected
25-
branch: 'main'
25+
branch: "main"
2626
allowlist: dependabot*

0 commit comments

Comments
 (0)