Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit a8833a8

Browse files
authored
Merge pull request #1 from linuxserver-labs/actions-v6
2 parents b7261d7 + c6f4571 commit a8833a8

File tree

5 files changed

+72
-11
lines changed

5 files changed

+72
-11
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Check for base image updates
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '0 0 * * 0'
7+
8+
jobs:
9+
call-workflow:
10+
uses: linuxserver-labs/docker-actions/.github/workflows/check-baseimage-update.yml@v6
11+
with:
12+
repo_owner: ${{ github.repository_owner }}
13+
baseimage: "alpine"
14+
basebranch: "3.15"
15+
app_name: "daedalos"
16+
secrets:
17+
repo_release_token: ${{ secrets.repo_release_token }}

.github/workflows/call-build-image.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@ name: Build Image On Release
33
on:
44
release:
55
types: [ published ]
6+
pull_request:
67

78
jobs:
89
call-workflow:
9-
uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v4.0.1
10+
uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v6
1011
with:
1112
repo_owner: ${{ github.repository_owner }}
1213
app_name: "daedalos"
14+
release_type: "github_commit"
15+
release_url: "https://api.github.com/repos/DustinBrett/daedalOS/commits/main"
16+
target-arch: "all"
1317
secrets:
1418
scarf_token: ${{ secrets.SCARF_TOKEN }}

.github/workflows/call-check-and-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
call-workflow:
10-
uses: linuxserver-labs/docker-actions/.github/workflows/check-and-release.yml@v4.0.1
10+
uses: linuxserver-labs/docker-actions/.github/workflows/check-and-release.yml@v6
1111
with:
1212
repo_owner: ${{ github.repository_owner }}
1313
app_name: "daedalos"

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
<!-- DO NOT EDIT THIS FILE MANUALLY -->
2-
<!-- Please read the https://github.com/linuxserver-labs/docker-daedalos/blob/master/.github/CONTRIBUTING.md -->
3-
41
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/lsio-labs-wide.png)](https://linuxserver.io)
52

63
[![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
@@ -35,6 +32,9 @@ Find us at:
3532
[![GitHub Stars](https://img.shields.io/github/stars/linuxserver-labs/docker-daedalos.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver-labs/docker-daedalos)
3633
[![GitHub Release](https://img.shields.io/github/release/linuxserver-labs/docker-daedalos.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver-labs/docker-daedalos/releases)
3734
[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver-labs/docker-daedalos/packages)
35+
[![ci](https://img.shields.io/github/workflow/status/linuxserver-labs/docker-daedalos/Check%20for%20update%20and%20release.svg?labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github&label=Check%20For%20Upstream%20Updates)](https://github.com/linuxserver-labs/docker-daedalos/actions/workflows/call-chck-and-release.yml)
36+
[![ci](https://img.shields.io/github/workflow/status/linuxserver-labs/docker-daedalos/Check%20for%20base%20image%20updates.svg?labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github&label=Check%20For%20Baseimage%20Updates)](https://github.com/linuxserver-labs/docker-daedalos/actions/workflows/call-baseimage-update.yml)
37+
[![ci](https://img.shields.io/github/workflow/status/linuxserver-labs/docker-daedalos/Build%20Image%20On%20Release.svg?labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github&label=Build%20Image)](https://github.com/linuxserver-labs/docker-daedalos/actions/workflows/call-build-image.yml)
3838

3939
[daedalOS](https://github.com/DustinBrett/daedalOS) - Desktop environment in the browser.
4040

@@ -48,11 +48,11 @@ Simply pulling `lscr.io/linuxserver-labs/daedalos` should retrieve the correct i
4848

4949
The architectures supported by this image are:
5050

51-
| Architecture | Tag |
52-
| :----: | --- |
53-
| x86-64 | latest |
54-
| arm64 | latest |
55-
| armhf | latest |
51+
| Architecture | Available | Tag |
52+
| :----: | :----: | ---- |
53+
| x86-64 | | latest |
54+
| arm64 | | latest |
55+
| armhf | | latest |
5656

5757
## Application Setup
5858

docker-bake.hcl

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,47 @@ target "image-local" {
1313
output = ["type=docker"]
1414
}
1515

16-
target "image-all" {
16+
target "amd64" {
17+
inherits = ["image"]
18+
dockerfile = "Dockerfile"
19+
platforms = [
20+
"linux/amd64"
21+
]
22+
}
23+
24+
target "arm64v8" {
25+
inherits = ["image"]
26+
dockerfile = "Dockerfile.aarch64"
27+
platforms = [
28+
"linux/arm64"
29+
]
30+
}
31+
32+
target "arm32v7" {
33+
inherits = ["image"]
34+
dockerfile = "Dockerfile.armhf"
35+
platforms = [
36+
"linux/arm/v7"
37+
]
38+
}
39+
40+
target "64" {
41+
inherits = ["image"]
42+
platforms = [
43+
"linux/amd64",
44+
"linux/arm64"
45+
]
46+
}
47+
48+
target "arm" {
49+
inherits = ["image"]
50+
platforms = [
51+
"linux/arm64",
52+
"linux/arm/v7"
53+
]
54+
}
55+
56+
target "all" {
1757
inherits = ["image"]
1858
platforms = [
1959
"linux/amd64",

0 commit comments

Comments
 (0)