Skip to content

Commit 301e464

Browse files
Bot Updating Templated Files
1 parent 73e9c47 commit 301e464

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

.github/workflows/external_trigger.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,18 @@ jobs:
4343
token=$(curl -sX GET \
4444
"https://ghcr.io/token?scope=repository%3Alinuxserver%2Ffreecad%3Apull" \
4545
| jq -r '.token')
46-
multidigest=$(curl -s \
47-
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
48-
--header "Authorization: Bearer ${token}" \
49-
"https://ghcr.io/v2/${image}/manifests/${tag}" \
50-
| jq -r 'first(.manifests[].digest)')
51-
digest=$(curl -s \
52-
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
53-
--header "Authorization: Bearer ${token}" \
54-
"https://ghcr.io/v2/${image}/manifests/${multidigest}" \
55-
| jq -r '.config.digest')
46+
multidigest=$(curl -s \
47+
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
48+
--header "Accept: application/vnd.oci.image.index.v1+json" \
49+
--header "Authorization: Bearer ${token}" \
50+
"https://ghcr.io/v2/${image}/manifests/${tag}")
51+
multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}")
52+
digest=$(curl -s \
53+
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
54+
--header "Accept: application/vnd.oci.image.manifest.v1+json" \
55+
--header "Authorization: Bearer ${token}" \
56+
"https://ghcr.io/v2/${image}/manifests/${multidigest}" \
57+
| jq -r '.config.digest')
5658
image_info=$(curl -sL \
5759
--header "Authorization: Bearer ${token}" \
5860
"https://ghcr.io/v2/${image}/blobs/${digest}")

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,13 @@ It is possible to install extra packages during container start using [universal
191191
- INSTALL_PACKAGES=libfuse2|git|gdb
192192
```
193193
194-
195194
## Usage
196195
197196
To help you get started creating a container from this image you can either use docker-compose or the docker cli.
198197
198+
>[!NOTE]
199+
>Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided.
200+
199201
### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
200202
201203
```yaml
@@ -240,8 +242,8 @@ Containers are configured using parameters passed at runtime (such as those abov
240242

241243
| Parameter | Function |
242244
| :----: | --- |
243-
| `-p 3000` | FreeCAD desktop gui. |
244-
| `-p 3001` | FreeCAD desktop gui HTTPS. |
245+
| `-p 3000:3000` | FreeCAD desktop gui. |
246+
| `-p 3001:3001` | FreeCAD desktop gui HTTPS. |
245247
| `-e PUID=1000` | for UserID - see below for explanation |
246248
| `-e PGID=1000` | for GroupID - see below for explanation |
247249
| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |

0 commit comments

Comments
 (0)