Skip to content

Commit 6600779

Browse files
Bot Updating Templated Files
1 parent 355cd40 commit 6600779

2 files changed

Lines changed: 16 additions & 12 deletions

File tree

.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%2Fphpmyadmin%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: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,13 @@ We support all of the official [environment variables](https://docs.phpmyadmin.n
6565

6666
For more information check out the [phpmyadmin documentation](https://www.phpmyadmin.net/docs/).
6767

68-
6968
## Usage
7069

7170
To help you get started creating a container from this image you can either use docker-compose or the docker cli.
7271

72+
>[!NOTE]
73+
>Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided.
74+
7375
### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
7476

7577
```yaml
@@ -113,7 +115,7 @@ Containers are configured using parameters passed at runtime (such as those abov
113115

114116
| Parameter | Function |
115117
| :----: | --- |
116-
| `-p 80` | Port for web frontend |
118+
| `-p 80:80` | Port for web frontend |
117119
| `-e PUID=1000` | for UserID - see below for explanation |
118120
| `-e PGID=1000` | for GroupID - see below for explanation |
119121
| `-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)