Skip to content

Commit 4767826

Browse files
authored
Merge pull request #90 from thediveo/develop
Develop
2 parents c05ffa3 + 75c6aca commit 4767826

7 files changed

Lines changed: 21 additions & 4 deletions

File tree

.devcontainer/fully-privileged/devcontainer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"node-for-all-with-yawn": "sudo ln -sf \"${NVM_BIN}/node\" /usr/local/bin/node",
5353
"yawn": ". ${NVM_DIR}/nvm.sh && cd web/lxkns && corepack enable && CI=1 yarn set version latest",
5454
"go-for-root": "echo 'Defaults:vscode secure_path = \"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin\"' | sudo tee -a /etc/sudoers.d/vscode",
55+
"no-first-run-notice": "rm -f /workspaces/.codespaces/shared/first-run-notice.txt",
5556
// considering the enormous noise made by the user namespace proponents
5657
// it breaks any existing and future irony meter that the same
5758
// distributions pushing user namespaces down our throats are now doing
@@ -64,10 +65,11 @@
6465
"customizations": {
6566
"vscode": {
6667
"extensions": [
67-
"stkb.rewrap",
68+
"dnut.rewrap-revived",
6869
"brunnerh.insert-unicode",
6970
"mhutchie.git-graph",
7071
"ms-vscode.live-server",
72+
"github.vscode-github-actions",
7173
"docker.docker"
7274
]
7375
}

.devcontainer/minimal-tooling/devcontainer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"node-for-all-with-yawn": "sudo ln -sf \"${NVM_BIN}/node\" /usr/local/bin/node",
3737
"yawn": ". ${NVM_DIR}/nvm.sh && cd web/lxkns && corepack enable && CI=1 yarn set version latest",
3838
"go-for-root": "echo 'Defaults:vscode secure_path = \"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin\"' | sudo tee -a /etc/sudoers.d/vscode",
39+
"no-first-run-notice": "rm -f /workspaces/.codespaces/shared/first-run-notice.txt",
3940
// considering the enormous noise made by the user namespace proponents
4041
// it breaks any existing and future irony meter that the same
4142
// distributions pushing user namespaces down our throats are now doing
@@ -48,10 +49,11 @@
4849
"customizations": {
4950
"vscode": {
5051
"extensions": [
51-
"stkb.rewrap",
52+
"dnut.rewrap-revived",
5253
"brunnerh.insert-unicode",
5354
"mhutchie.git-graph",
5455
"ms-vscode.live-server",
56+
"github.vscode-github-actions",
5557
"docker.docker"
5658
]
5759
}

.devcontainer/minimal-with-go/devcontainer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"postCreateCommand": {
3939
"use-project-lxknsrc": "ln -sf ${containerWorkspaceFolder}/.lxknsrc.yaml ${HOME}/.lxknsrc.yaml",
4040
"go-for-root": "echo 'Defaults:vscode secure_path = \"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin\"' | sudo tee -a /etc/sudoers.d/vscode",
41+
"no-first-run-notice": "rm -f /workspaces/.codespaces/shared/first-run-notice.txt",
4142
// considering the enormous noise made by the user namespace proponents
4243
// it breaks any existing and future irony meter that the same
4344
// distributions pushing user namespaces down our throats are now doing
@@ -50,10 +51,11 @@
5051
"customizations": {
5152
"vscode": {
5253
"extensions": [
53-
"stkb.rewrap",
54+
"dnut.rewrap-revived",
5455
"brunnerh.insert-unicode",
5556
"mhutchie.git-graph",
5657
"ms-vscode.live-server",
58+
"github.vscode-github-actions",
5759
"docker.docker"
5860
]
5961
}

.github/workflows/buildandrelease.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
- 'v[0-9]+.[0-9]+.[0-9]+'
77
- 'v[0-9]+.[0-9]+.[0-9]+-*'
88

9+
permissions:
10+
contents: read
11+
912
env:
1013
PLATFORMS: linux/amd64,linux/arm64
1114
BUILDCONTEXTS: "" # ugly band-aid as per https://github.com/github/vscode-github-actions/issues/47#issuecomment-1488592302

.github/workflows/codeql-analysis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
language: [ 'go', 'javascript' ]
27+
language: [ 'go', 'javascript', 'actions' ]
2828

2929
steps:
3030
- name: Checkout repository

deployments/industrial-edge/lxkns-ieapp/docker-compose.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ services:
77
command:
88
- "/lxkns"
99
user: "65534"
10+
security_opt:
11+
# apparmor only accepts a profile name, or unconfined; now there
12+
# are Industrial Edge configurations that enable AppArmor and the
13+
# default container rules conflict with what lxkns needs to do on
14+
# behalf of its user. So switch AppArmor off for the lxkns service
15+
# container.
16+
- apparmor:unconfined
1017
# Clean all default capabilities Docker might otherwise grant us and
1118
# several of them we don't need; add only those capabilities we really
1219
# need, such as CAP_WORLD_DOMINATION.

lxkns.code-workspace

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"markdown.styles": [
2727
"style.css"
2828
],
29+
"workbench.tree.indent": 16,
2930
},
3031
"extensions": {
3132
"recommendations": [

0 commit comments

Comments
 (0)