Add support for ghcr.io

This commit is contained in:
Aleksandar Puharic 2023-04-11 12:43:59 +02:00
parent 11076e36e5
commit bd27824a51
Signed by: xZero707
GPG Key ID: 3CC53DCAA9C237BB
3 changed files with 17 additions and 6 deletions

View File

@ -27,6 +27,13 @@ jobs:
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{github.actor}}
password: ${{secrets.PAT_TOKEN}}
-
name: Build and push
uses: docker/bake-action@v2.3.0

View File

@ -4,15 +4,18 @@ The simplest and fastest way to get S6 supervisor in your image
### Usage
```Docker
COPY --from=nlss/s6-rootfs:latest ["/", "/"]
COPY --from=ghcr.io/n0rthernl1ghts/s6-rootfs:latest ["/", "/"]
```
or with fixed version:
```Docker
COPY --from=nlss/s6-rootfs:3.1.2.1 ["/", "/"]
COPY --from=ghcr.io/n0rthernl1ghts/s6-rootfs:3.1.2.1 ["/", "/"]
```
That's it!
Note: We're moving to ghcr.io. `docker.io/nlss/s6-rootfs` will be kept up-to-date until May 2023, when is Docker sunsetting free teams.<br/>
It is highly recommended that you start using `ghcr.io/n0rthernl1ghts/s6-rootfs`.
###### Recommended way to integrate with your image (example)
```Docker
# ---------------------
@ -24,7 +27,7 @@ FROM scratch AS rootfs
COPY ["./rootfs", "/"]
# Install S6
COPY --from=nlss/s6-rootfs:3.1.2.1 ["/", "/"]
COPY --from=ghcr.io/n0rthernl1ghts/s6-rootfs:3.1.2.1 ["/", "/"]
# ---------------------
@ -44,4 +47,3 @@ ENV S6_CMD_RECEIVE_SIGNALS=1
# Important, this is required for S6 to work
ENTRYPOINT ["/init"]
```

View File

@ -68,11 +68,13 @@ function "get-tags" {
params = [version, extra_versions]
result = concat(
[
"docker.io/nlss/s6-rootfs:${version}"
"docker.io/nlss/s6-rootfs:${version}",
"ghcr.io/n0rthernl1ghts/s6-rootfs:${version}"
],
flatten([
for extra_version in extra_versions : [
"docker.io/nlss/s6-rootfs:${extra_version}"
"docker.io/nlss/s6-rootfs:${extra_version}",
"ghcr.io/n0rthernl1ghts/s6-rootfs:${extra_version}"
]
])
)