Skip to content

Commit 3a5f7bb

Browse files
ParkreinerParkreiner
committed
Merge branch 'main' into mes/logs-flake
2 parents 42cb73b + 719c9cc commit 3a5f7bb

File tree

7 files changed

+30
-16
lines changed

7 files changed

+30
-16
lines changed

‎.devcontainer/filebrowser/install.sh

100644100755
Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,15 @@ printf "%sInstalling filebrowser\n\n" "${BOLD}"
88

99
# Check if filebrowser is installed.
1010
if ! command -v filebrowser &>/dev/null; then
11-
curl -fsSL https://raw.githubusercontent.com/filebrowser/get/master/get.sh | bash
11+
VERSION="v2.42.1"
12+
EXPECTED_HASH="7d83c0f077df10a8ec9bfd9bf6e745da5d172c3c768a322b0e50583a6bc1d3cc"
13+
14+
curl -fsSL "https://github.com/filebrowser/filebrowser/releases/download/${VERSION}/linux-amd64-filebrowser.tar.gz" -o /tmp/filebrowser.tar.gz
15+
echo "${EXPECTED_HASH} /tmp/filebrowser.tar.gz" | sha256sum -c
16+
tar -xzf /tmp/filebrowser.tar.gz -C /tmp
17+
sudo mv /tmp/filebrowser /usr/local/bin/
18+
sudo chmod +x /usr/local/bin/filebrowser
19+
rm /tmp/filebrowser.tar.gz
1220
fi
1321

1422
# Create entrypoint.

‎.devcontainer/scripts/post_create.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
install_devcontainer_cli() {
4-
npm install -g @devcontainers/cli
4+
npm install -g @devcontainers/cli@0.80.0 --integrity=sha512-w2EaxgjyeVGyzfA/KUEZBhyXqu/5PyWNXcnrXsZOBrt3aN2zyGiHrXoG54TF6K0b5DSCF01Rt5fnIyrCeFzFKw==
55
}
66

77
install_ssh_config() {

‎.github/workflows/ci.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,11 @@ jobs:
340340
- name: Disable Spotlight Indexing
341341
if: runner.os == 'macOS'
342342
run: |
343+
enabled=$(sudo mdutil -a -s | grep "Indexing enabled" | wc -l)
344+
if [ $enabled -eq 0 ]; then
345+
echo "Spotlight indexing is already disabled"
346+
exit 0
347+
fi
343348
sudo mdutil -a -i off
344349
sudo mdutil -X /
345350
sudo launchctl bootout system /System/Library/LaunchDaemons/com.apple.metadata.mds.plist
@@ -959,7 +964,7 @@ jobs:
959964
- name: Switch XCode Version
960965
uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
961966
with:
962-
xcode-version: "16.0.0"
967+
xcode-version: "16.1.0"
963968

964969
- name: Setup Go
965970
uses: ./.github/actions/setup-go

‎dogfood/coder-envbuilder/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ module "dotfiles" {
123123

124124
module "personalize" {
125125
source = "dev.registry.coder.com/coder/personalize/coder"
126-
version = "1.0.30"
126+
version = "1.0.31"
127127
agent_id = coder_agent.dev.id
128128
}
129129

@@ -148,13 +148,13 @@ module "jetbrains_gateway" {
148148

149149
module "filebrowser" {
150150
source = "dev.registry.coder.com/coder/filebrowser/coder"
151-
version = "1.1.1"
151+
version = "1.1.2"
152152
agent_id = coder_agent.dev.id
153153
}
154154

155155
module "coder-login" {
156156
source = "dev.registry.coder.com/coder/coder-login/coder"
157-
version = "1.0.30"
157+
version = "1.0.31"
158158
agent_id = coder_agent.dev.id
159159
}
160160

‎dogfood/coder/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ RUN apt-get update && \
2929
mkdir --parents /usr/local/go && \
3030
tar --extract --gzip --directory=/usr/local/go --file=/usr/local/go.tar.gz --strip-components=1 && \
3131
mkdir --parents "$GOPATH" && \
32+
go env -w GOSUMDB=sum.golang.org && \
3233
# moq for Go tests.
3334
go install github.com/matryer/moq@v0.2.3 && \
3435
# swag for Swagger doc generation
@@ -252,9 +253,9 @@ RUN source $NVM_DIR/nvm.sh && \
252253
nvm install $NODE_VERSION && \
253254
nvm use $NODE_VERSION
254255
ENV PATH=$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
255-
# Allow patch updates for npm and pnpm
256-
RUN npm install -g npm@10.8.1 --integrity=sha512-Dp1C6SvSMYQI7YHq/y2l94uvI+59Eqbu1EpuKQHQ8p16txXRuRit5gH3Lnaagk2aXDIjg/Iru9pd05bnneKgdw==
257-
RUN npm install -g pnpm@9.15.1 --integrity=sha512-GstWXmGT7769p3JwKVBGkVDPErzHZCYudYfnHRncmKQj3/lTblfqRMSb33kP9pToPCe+X6oj1n4MAztYO+S/zw==
256+
RUN corepack enable && \
257+
corepack prepare npm@10.8.1 --activate && \
258+
corepack prepare pnpm@9.15.1 --activate
258259

259260
RUN pnpx playwright@1.47.0 install --with-deps chromium
260261

‎dogfood/coder/main.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -264,15 +264,15 @@ data "coder_workspace_tags" "tags" {
264264
module "slackme" {
265265
count = data.coder_workspace.me.start_count
266266
source = "dev.registry.coder.com/coder/slackme/coder"
267-
version = "1.0.30"
267+
version = "1.0.31"
268268
agent_id = coder_agent.dev.id
269269
auth_provider_id = "slack"
270270
}
271271

272272
module "dotfiles" {
273273
count = data.coder_workspace.me.start_count
274274
source = "dev.registry.coder.com/coder/dotfiles/coder"
275-
version = "1.2.0"
275+
version = "1.2.1"
276276
agent_id = coder_agent.dev.id
277277
}
278278

@@ -288,7 +288,7 @@ module "git-clone" {
288288
module "personalize" {
289289
count = data.coder_workspace.me.start_count
290290
source = "dev.registry.coder.com/coder/personalize/coder"
291-
version = "1.0.30"
291+
version = "1.0.31"
292292
agent_id = coder_agent.dev.id
293293
}
294294

@@ -327,15 +327,15 @@ module "jetbrains" {
327327
module "filebrowser" {
328328
count = data.coder_workspace.me.start_count
329329
source = "dev.registry.coder.com/coder/filebrowser/coder"
330-
version = "1.1.1"
330+
version = "1.1.2"
331331
agent_id = coder_agent.dev.id
332332
agent_name = "dev"
333333
}
334334

335335
module "coder-login" {
336336
count = data.coder_workspace.me.start_count
337337
source = "dev.registry.coder.com/coder/coder-login/coder"
338-
version = "1.0.30"
338+
version = "1.0.31"
339339
agent_id = coder_agent.dev.id
340340
}
341341

@@ -358,7 +358,7 @@ module "windsurf" {
358358
module "zed" {
359359
count = data.coder_workspace.me.start_count
360360
source = "dev.registry.coder.com/coder/zed/coder"
361-
version = "1.0.0"
361+
version = "1.0.1"
362362
agent_id = coder_agent.dev.id
363363
agent_name = "dev"
364364
folder = local.repo_dir

‎scripts/Dockerfile.base

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This is the base image used for Coder images. It's a multi-arch image that is
22
# built in depot.dev for all supported architectures. Since it's built on real
33
# hardware and not cross-compiled, it can have "RUN" commands.
4-
FROM alpine:3.21.3
4+
FROM alpine:3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
55

66
# We use a single RUN command to reduce the number of layers in the image.
77
# NOTE: Keep the Terraform version in sync with minTerraformVersion and

0 commit comments

Comments
 (0)