Skip to content

Commit fd5f3e6

Browse files
ericpaulsenericpaulsen
committed
Merge branch 'main' into helm-ca-certs
merge main in
2 parents 5e2a75c + 0783ca3 commit fd5f3e6

File tree

178 files changed

+6292
-2414
lines changed

Some content is hidden

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

178 files changed

+6292
-2414
lines changed

‎.github/workflows/coder.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -674,3 +674,10 @@ jobs:
674674
buildScriptName: "storybook:build"
675675
projectToken: 695c25b6cb65
676676
workingDir: "./site"
677+
markdown-link-check:
678+
runs-on: ubuntu-latest
679+
steps:
680+
- uses: actions/checkout@master
681+
- uses: gaurav-nelson/github-action-markdown-link-check@v1
682+
with:
683+
config-file: .github/workflows/mlc_config.json

‎.github/workflows/mlc_config.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"ignorePatterns": [
3+
{
4+
"pattern": ":\/\/localhost"
5+
},
6+
{
7+
"pattern": ":\/\/.*.?example\\.com"
8+
},
9+
{
10+
"pattern": "developer.github.com"
11+
},
12+
{
13+
"pattern": "tailscale.com"
14+
}
15+
]
16+
}

‎.golangci.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,15 @@ linters:
235235
- noctx
236236
- paralleltest
237237
- revive
238-
- rowserrcheck
239-
- sqlclosecheck
238+
239+
# These don't work until the following issue is solved.
240+
# https://github.com/golangci/golangci-lint/issues/2649
241+
# - rowserrcheck
242+
# - sqlclosecheck
243+
# - structcheck
244+
# - wastedassign
245+
240246
- staticcheck
241-
- structcheck
242247
- tenv
243248
# In Go, it's possible for a package to test it's internal functionality
244249
# without testing any exported functions. This is enabled to promote
@@ -253,4 +258,3 @@ linters:
253258
- unconvert
254259
- unused
255260
- varcheck
256-
- wastedassign

‎Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ LABEL \
1212
org.opencontainers.image.description="A tool for provisioning self-hosted development environments with Terraform." \
1313
org.opencontainers.image.url="https://github.com/coder/coder" \
1414
org.opencontainers.image.source="https://github.com/coder/coder" \
15-
org.opencontainers.image.version="$CODER_VERSION" \
16-
org.opencontainers.image.licenses="AGPL-3.0"
15+
org.opencontainers.image.version="$CODER_VERSION"
1716

1817
# The coder binary is injected by scripts/build_docker.sh.
1918
COPY --chown=coder:coder --chmod=755 coder /opt/coder

0 commit comments

Comments
 (0)