Skip to content

Commit 07e9613

Browse files
SasSwartSasSwart
committed
Merge remote-tracking branch 'origin/main' into prebuilds-db
2 parents 390a1fd + f01ee96 commit 07e9613

Some content is hidden

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

51 files changed

+961
-876
lines changed

‎coderd/database/dbmem/dbmem.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9644,7 +9644,7 @@ func (q *FakeQuerier) PaginatedOrganizationMembers(_ context.Context, arg databa
96449644
// All of the members in the organization
96459645
orgMembers := make([]database.OrganizationMember, 0)
96469646
for _, mem := range q.organizationMembers {
9647-
if arg.OrganizationID != uuid.Nil && mem.OrganizationID != arg.OrganizationID {
9647+
if mem.OrganizationID != arg.OrganizationID {
96489648
continue
96499649
}
96509650

@@ -9654,7 +9654,7 @@ func (q *FakeQuerier) PaginatedOrganizationMembers(_ context.Context, arg databa
96549654
selectedMembers := make([]database.PaginatedOrganizationMembersRow, 0)
96559655

96569656
skippedMembers := 0
9657-
for _, organizationMember := range q.organizationMembers {
9657+
for _, organizationMember := range orgMembers {
96589658
if skippedMembers < int(arg.OffsetOpt) {
96599659
skippedMembers++
96609660
continue

‎codersdk/organizations.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,13 @@ type OrganizationMemberWithUserData struct {
8282
}
8383

8484
type PaginatedMembersRequest struct {
85-
OrganizationID uuid.UUID `table:"organization id" json:"organization_id" format:"uuid"`
86-
Limit int `json:"limit,omitempty"`
87-
Offset int `json:"offset,omitempty"`
85+
Limit int `json:"limit,omitempty"`
86+
Offset int `json:"offset,omitempty"`
8887
}
8988

9089
type PaginatedMembersResponse struct {
91-
Members []OrganizationMemberWithUserData
92-
Count int `json:"count"`
90+
Members []OrganizationMemberWithUserData `json:"members"`
91+
Count int `json:"count"`
9392
}
9493

9594
type CreateOrganizationRequest struct {

‎docs/admin/external-auth.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Inside your Terraform code, you now have access to authentication variables. Ref
5959
Use [`external-auth`](../reference/cli/external-auth.md) in the Coder CLI to access a token within the workspace:
6060

6161
```shell
62-
coder external-auth <USER_DEFINED_ID> access-token
62+
coder external-auth access-token <USER_DEFINED_ID>
6363
```
6464

6565
## Git-provider specific env variables

‎docs/admin/integrations/prometheus.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,12 @@ metadata:
8484
namespace: coder
8585
spec:
8686
endpoints:
87-
- port: prometheus-http
87+
- port: prom-http
8888
interval: 10s
8989
scrapeTimeout: 10s
90+
namespaceSelector:
91+
matchNames:
92+
- coder
9093
selector:
9194
matchLabels:
9295
app.kubernetes.io/name: coder

‎docs/admin/templates/troubleshooting.md

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,3 +170,59 @@ See our
170170
to optimize your templates based on this data.
171171

172172
![Workspace build timings UI](../../images/admin/templates/troubleshooting/workspace-build-timings-ui.png)
173+
174+
## Docker Workspaces on Raspberry Pi OS
175+
176+
### Unable to query ContainerMemory
177+
178+
When you query `ContainerMemory` and encounter the error:
179+
180+
```shell
181+
open /sys/fs/cgroup/memory.max: no such file or directory
182+
```
183+
184+
This error mostly affects Raspberry Pi OS, but might also affect older Debian-based systems as well.
185+
186+
<details><summary>Add cgroup_memory and cgroup_enable to cmdline.txt:</summary>
187+
188+
1. Confirm the list of existing cgroup controllers doesn't include `memory`:
189+
190+
```console
191+
$ cat /sys/fs/cgroup/cgroup.controllers
192+
cpuset cpu io pids
193+
194+
$ cat /sys/fs/cgroup/cgroup.subtree_control
195+
cpuset cpu io pids
196+
```
197+
198+
1. Add cgroup entries to `cmdline.txt` in `/boot/firmware` (or `/boot/` on older Pi OS releases):
199+
200+
```text
201+
cgroup_memory=1 cgroup_enable=memory
202+
```
203+
204+
You can use `sed` to add it to the file for you:
205+
206+
```bash
207+
sudo sed -i '$s/$/ cgroup_memory=1 cgroup_enable=memory/' /boot/firmware/cmdline.txt
208+
```
209+
210+
1. Reboot:
211+
212+
```bash
213+
sudo reboot
214+
```
215+
216+
1. Confirm that the list of cgroup controllers now includes `memory`:
217+
218+
```console
219+
$ cat /sys/fs/cgroup/cgroup.controllers
220+
cpuset cpu io memory pids
221+
222+
$ cat /sys/fs/cgroup/cgroup.subtree_control
223+
cpuset cpu io memory pids
224+
```
225+
226+
Read more about cgroup controllers in [The Linux Kernel](https://docs.kernel.org/admin-guide/cgroup-v2.html#controlling-controllers) documentation.
227+
228+
</details>

‎docs/images/install/coder-setup.png

-199 KB
Binary file not shown.

‎docs/images/screenshots/welcome-create-admin-user.png

11.6 KB
Loading

‎docs/install/cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ To start the Coder server:
4949
coder server
5050
```
5151

52-
![Coder install](../images/install/coder-setup.png)
52+
![Coder install](../images/screenshots/welcome-create-admin-user.png)
5353

5454
To log in to an existing Coder deployment:
5555

‎docs/install/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ To start the Coder server:
6060
coder server
6161
```
6262

63-
![Coder install](../images/install/coder-setup.png)
63+
![Coder install](../images/screenshots/welcome-create-admin-user.png)
6464

6565
To log in to an existing Coder deployment:
6666

‎docs/install/offline.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ RUN mkdir -p /opt/terraform
5757
# for supported Terraform versions.
5858
ARG TERRAFORM_VERSION=1.11.0
5959
RUN apk update && \
60-
apk del terraform && \
6160
curl -LOs https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
6261
&& unzip -o terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
6362
&& mv terraform /opt/terraform \

0 commit comments

Comments
 (0)