Skip to content

Commit c1b02ed

Browse files
johnstcnjohnstcn
committed
remove contents dirs
1 parent 9e75d97 commit c1b02ed

Some content is hidden

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

42 files changed

+18
-18
lines changed

‎.github/dependabot.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ updates:
3737
# Update our Dockerfile.
3838
- package-ecosystem: "docker"
3939
directories:
40-
- "/dogfood/coder/contents"
41-
- "/dogfood/coder-envbuilder/contents"
40+
- "/dogfood/coder"
41+
- "/dogfood/coder-envbuilder"
4242
- "/scripts"
4343
- "/examples/templates/docker/build"
4444
- "/examples/parameters/build"

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jobs:
172172

173173
- name: Get golangci-lint cache dir
174174
run: |
175-
linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/coder/contents/Dockerfile | cut -d '=' -f 2)
175+
linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/coder/Dockerfile | cut -d '=' -f 2)
176176
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$linter_ver
177177
dir=$(golangci-lint cache status | awk '/Dir/ { print $2 }')
178178
echo "LINT_CACHE_DIR=$dir" >> $GITHUB_ENV

‎.github/workflows/dogfood.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
project: b4q6ltmpzh
6969
token: ${{ secrets.DEPOT_TOKEN }}
7070
buildx-fallback: true
71-
context: "{{defaultContext}}:dogfood/coder/contents"
71+
context: "{{defaultContext}}:dogfood/coder"
7272
pull: true
7373
save: true
7474
push: ${{ github.ref == 'refs/heads/main' }}
@@ -114,15 +114,15 @@ jobs:
114114
- name: Terraform init and validate
115115
run: |
116116
pushd dogfood/
117-
terraform init -upgrade
117+
terraform init
118118
terraform validate
119119
popd
120-
pushd coder/contents
121-
terraform init -upgrade
120+
pushd coder
121+
terraform init
122122
terraform validate
123123
popd
124-
pushd coder-envbuilder/contents
125-
terraform init -upgrade
124+
pushd coder-envbuilder
125+
terraform init
126126
terraform validate
127127
popd
128128
@@ -148,6 +148,6 @@ jobs:
148148
# Template source & details
149149
TF_VAR_CODER_TEMPLATE_NAME: ${{ secrets.CODER_TEMPLATE_NAME }}
150150
TF_VAR_CODER_TEMPLATE_VERSION: ${{ steps.vars.outputs.sha_short }}
151-
TF_VAR_CODER_TEMPLATE_DIR: ./contents
151+
TF_VAR_CODER_TEMPLATE_DIR: ./dogfood
152152
TF_VAR_CODER_TEMPLATE_MESSAGE: ${{ steps.message.outputs.pr_title }}
153153
TF_LOG: info

‎.github/workflows/security.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
# version in the comments will differ. This is also defined in
100100
# ci.yaml.
101101
set -euxo pipefail
102-
cd dogfood/coder/contents
102+
cd dogfood/coder
103103
mkdir -p /usr/local/bin
104104
mkdir -p /usr/local/include
105105

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ lint/ts: site/node_modules/.installed
505505
lint/go:
506506
./scripts/check_enterprise_imports.sh
507507
./scripts/check_codersdk_imports.sh
508-
linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/coder/contents/Dockerfile | cut -d '=' -f 2)
508+
linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/coder/Dockerfile | cut -d '=' -f 2)
509509
go run github.com/golangci/golangci-lint/cmd/golangci-lint@v$$linter_ver run
510510
.PHONY: lint/go
511511

@@ -963,5 +963,5 @@ else
963963
endif
964964
.PHONY: test-e2e
965965

966-
dogfood/coder/contents/nix.hash: flake.nix flake.lock
967-
sha256sum flake.nix flake.lock >./dogfood/coder/contents/nix.hash
966+
dogfood/coder/nix.hash: flake.nix flake.lock
967+
sha256sum flake.nix flake.lock >./dogfood/coder/nix.hash

‎dogfood/coder-envbuilder/contents/README.md renamed to ‎dogfood/coder-envbuilder/README.md

‎dogfood/coder-envbuilder/contents/main.tf renamed to ‎dogfood/coder-envbuilder/main.tf

File renamed without changes.

‎dogfood/coder/contents/Dockerfile renamed to ‎dogfood/coder/Dockerfile

File renamed without changes.

‎dogfood/coder/contents/Makefile renamed to ‎dogfood/coder/Makefile

File renamed without changes.

‎dogfood/coder/contents/README.md renamed to ‎dogfood/coder/README.md

‎dogfood/coder/contents/devcontainer.json renamed to ‎dogfood/coder/devcontainer.json

File renamed without changes.

‎dogfood/coder/contents/files/etc/apt/apt.conf.d/80-no-recommends renamed to ‎dogfood/coder/files/etc/apt/apt.conf.d/80-no-recommends

File renamed without changes.

‎dogfood/coder/contents/files/etc/apt/apt.conf.d/80-retries renamed to ‎dogfood/coder/files/etc/apt/apt.conf.d/80-retries

File renamed without changes.

‎dogfood/coder/contents/files/etc/apt/preferences.d/containerd renamed to ‎dogfood/coder/files/etc/apt/preferences.d/containerd

File renamed without changes.

‎dogfood/coder/contents/files/etc/apt/preferences.d/docker renamed to ‎dogfood/coder/files/etc/apt/preferences.d/docker

File renamed without changes.

‎dogfood/coder/contents/files/etc/apt/preferences.d/github-cli renamed to ‎dogfood/coder/files/etc/apt/preferences.d/github-cli

File renamed without changes.

‎dogfood/coder/contents/files/etc/apt/preferences.d/google-cloud renamed to ‎dogfood/coder/files/etc/apt/preferences.d/google-cloud

File renamed without changes.

‎dogfood/coder/contents/files/etc/apt/preferences.d/hashicorp renamed to ‎dogfood/coder/files/etc/apt/preferences.d/hashicorp

File renamed without changes.

‎dogfood/coder/contents/files/etc/apt/preferences.d/ppa renamed to ‎dogfood/coder/files/etc/apt/preferences.d/ppa

File renamed without changes.

‎dogfood/coder/contents/files/etc/apt/sources.list.d/docker.list renamed to ‎dogfood/coder/files/etc/apt/sources.list.d/docker.list

File renamed without changes.

‎dogfood/coder/contents/files/etc/apt/sources.list.d/google-cloud.list renamed to ‎dogfood/coder/files/etc/apt/sources.list.d/google-cloud.list

File renamed without changes.

‎dogfood/coder/contents/files/etc/apt/sources.list.d/hashicorp.list renamed to ‎dogfood/coder/files/etc/apt/sources.list.d/hashicorp.list

File renamed without changes.

‎dogfood/coder/contents/files/etc/apt/sources.list.d/postgresql.list renamed to ‎dogfood/coder/files/etc/apt/sources.list.d/postgresql.list

File renamed without changes.

‎dogfood/coder/contents/files/etc/apt/sources.list.d/ppa.list renamed to ‎dogfood/coder/files/etc/apt/sources.list.d/ppa.list

File renamed without changes.

‎dogfood/coder/contents/files/etc/docker/daemon.json renamed to ‎dogfood/coder/files/etc/docker/daemon.json

File renamed without changes.

‎dogfood/coder/contents/files/usr/share/keyrings/ansible.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/ansible.gpg

File renamed without changes.

‎dogfood/coder/contents/files/usr/share/keyrings/docker.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/docker.gpg

File renamed without changes.

‎dogfood/coder/contents/files/usr/share/keyrings/fish-shell.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/fish-shell.gpg

File renamed without changes.

‎dogfood/coder/contents/files/usr/share/keyrings/git-core.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/git-core.gpg

File renamed without changes.

‎dogfood/coder/contents/files/usr/share/keyrings/github-cli.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/github-cli.gpg

File renamed without changes.

‎dogfood/coder/contents/files/usr/share/keyrings/google-cloud.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/google-cloud.gpg

File renamed without changes.

‎dogfood/coder/contents/files/usr/share/keyrings/hashicorp.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/hashicorp.gpg

File renamed without changes.

‎dogfood/coder/contents/files/usr/share/keyrings/helix.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/helix.gpg

File renamed without changes.

‎dogfood/coder/contents/files/usr/share/keyrings/neovim.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/neovim.gpg

File renamed without changes.

‎dogfood/coder/contents/files/usr/share/keyrings/postgresql.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/postgresql.gpg

File renamed without changes.

‎dogfood/coder/contents/guide.md renamed to ‎dogfood/coder/guide.md

‎dogfood/coder/contents/main.tf renamed to ‎dogfood/coder/main.tf

File renamed without changes.

‎dogfood/coder/contents/nix.hash renamed to ‎dogfood/coder/nix.hash

File renamed without changes.

‎dogfood/coder/contents/update-keys.sh renamed to ‎dogfood/coder/update-keys.sh

File renamed without changes.

‎dogfood/coder/contents/zed/main.tf renamed to ‎dogfood/coder/zed/main.tf

File renamed without changes.

‎dogfood/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ terraform {
44
source = "coder/coderd"
55
}
66
}
7-
backend "gcs" {
8-
bucket = "coder-dogfood-tf-state"
9-
}
7+
# backend "gcs" {
8+
# bucket = "coder-dogfood-tf-state"
9+
# }
1010
}
1111

1212
data "coderd_organization" "default" {

‎scripts/update-flake.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ echo "protoc-gen-go version: $PROTOC_GEN_GO_REV"
3737
PROTOC_GEN_GO_SHA256=$(nix-prefetch-git https://github.com/protocolbuffers/protobuf-go --rev "$PROTOC_GEN_GO_REV" | jq -r .hash)
3838
sed -i "s#\(sha256 = \"\)[^\"]*#\1${PROTOC_GEN_GO_SHA256}#" ./flake.nix
3939
40-
make dogfood/coder/contents/nix.hash
40+
make dogfood/coder/nix.hash
4141
4242
echo "Flake updated successfully!"

0 commit comments

Comments
 (0)