Skip to content

Commit e61f259

Browse files
authored
Merge branch 'main' into dependabot/github_actions/actions/cache-6
2 parents 36d59c0 + ce69cdc commit e61f259

3 files changed

Lines changed: 27 additions & 29 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/ultramarine-linux/ultramarine:43
1+
FROM ghcr.io/ultramarine-linux/ultramarine:44
22

33
# Install dependencies
44
RUN dnf do -y --action=install \
@@ -10,6 +10,6 @@ RUN dnf do -y --action=install \
1010
git \
1111
zig \
1212
cloud-hypervisor-nightly
13-
13+
1414
RUN mkdir -p /run/odorobo/vms
15-
RUN chmod -R 1777 /run/odorobo
15+
RUN chmod -R 1777 /run/odorobo

.devcontainer/devcontainer.json

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
11
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
22
// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile
33
{
4-
"features": {
5-
"ghcr.io/devcontainers/features/rust:1": {},
6-
},
7-
"name": "Dev",
8-
"build": {
9-
// Sets the run context to one level up instead of the .devcontainer folder.
10-
"context": ".",
11-
// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
12-
"dockerfile": "Dockerfile"
13-
},
14-
// required for netlink and other privileged operations
15-
"privileged": true,
16-
"capAdd": [
17-
"NET_ADMIN"
18-
],
4+
"features": {
5+
"ghcr.io/devcontainers/features/rust:1": {},
6+
},
7+
"name": "Dev",
8+
"build": {
9+
// Sets the run context to one level up instead of the .devcontainer folder.
10+
"context": ".",
11+
// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
12+
"dockerfile": "Dockerfile",
13+
},
14+
// required for netlink and other privileged operations
15+
"privileged": true,
16+
"capAdd": ["NET_ADMIN"],
1917

20-
// Features to add to the dev container. More info: https://containers.dev/features.
21-
// "features": {},
18+
// Features to add to the dev container. More info: https://containers.dev/features.
19+
// "features": {},
2220

23-
// Use 'forwardPorts' to make a list of ports inside the container available locally.
24-
// "forwardPorts": [],
21+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
22+
// "forwardPorts": [],
2523

26-
// Uncomment the next line to run commands after the container is created.
27-
// "postCreateCommand": "cat /etc/os-release",
24+
// Uncomment the next line to run commands after the container is created.
25+
// "postCreateCommand": "cat /etc/os-release",
2826

29-
// Configure tool-specific properties.
30-
// "customizations": {},
27+
// Configure tool-specific properties.
28+
// "customizations": {},
3129

32-
// Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root.
33-
// "remoteUser": "devcontainer"
30+
// Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root.
31+
// "remoteUser": "devcontainer"
3432
}

.github/workflows/mirror.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1212
with:
1313
fetch-depth: 0
14-
- uses: yesolutions/mirror-action@master
14+
- uses: yesolutions/mirror-action@1708f16cdb28634fd3ba10c5c79abc91f5578a14 # v0.7.0
1515
with:
1616
REMOTE: "https://codeberg.org/FyraStack/odorobo.git"
1717
GIT_USERNAME: ${{ secrets.GIT_USERNAME }}

0 commit comments

Comments
 (0)