Skip to content

Commit

Permalink
Merge pull request #32 from kmahyyg/bump-version-240127
Browse files Browse the repository at this point in the history
version upgrade
  • Loading branch information
kmahyyg authored Jan 27, 2024
2 parents 7705d65 + 7749c81 commit 869babd
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 19 deletions.
36 changes: 18 additions & 18 deletions .github/workflows/docker4commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,32 @@ jobs:
platform-tag: "x86_64"
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
- name: Prepare destination folder
run: mkdir -p /tmp/build/out
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: ${{ env.platform-name }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Login to GHCR
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build Docker image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
platforms: ${{ env.platform-name }}
Expand All @@ -67,7 +67,7 @@ jobs:
ghcr.io/${{ env.IMAGE_NAME }}:sha256-${{ github.sha }}-${{ env.platform-tag }}
- name: Publish the Image
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
platforms: ${{ env.platform-name }}
Expand All @@ -81,7 +81,7 @@ jobs:
tags: |
ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-${{ env.platform-tag }}
- name: Archive generated artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
retention-days: 30
name: dir-ztncui-aio-${{ env.platform-tag }}
Expand All @@ -97,32 +97,32 @@ jobs:
platform-tag: "aarch64"
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
- name: Prepare destination folder
run: mkdir -p /tmp/build/out
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: ${{ env.platform-name }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Login to GHCR
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build Docker image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
platforms: ${{ env.platform-name }}
Expand All @@ -139,7 +139,7 @@ jobs:
ghcr.io/${{ env.IMAGE_NAME }}:sha256-${{ github.sha }}-${{ env.platform-tag }}
- name: Publish the Image
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
platforms: ${{ env.platform-name }}
Expand All @@ -153,7 +153,7 @@ jobs:
tags: |
ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-${{ env.platform-tag }}
- name: Archive generated artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
retention-days: 30
name: dir-ztncui-aio-${{ env.platform-tag }}
Expand All @@ -174,7 +174,7 @@ jobs:
run: |
mkdir -p /tmp/relbuild/${{ github.repository_owner }}
- name: Login To GHCR
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
Expand All @@ -186,7 +186,7 @@ jobs:
docker manifest create ghcr.io/${{ env.IMAGE_NAME }}:latest --amend ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64 --amend ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-x86_64
docker manifest push ghcr.io/${{ env.IMAGE_NAME }}:latest
- name: Download artifacts previously
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: /tmp/relbuild/${{ github.repository_owner }}
- name: Compress all artifacts using ZSTD
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

![](https://github.com/kmahyyg/ztncui-aio/actions/workflows/docker4commit.yml/badge.svg)

Current Version: 20230501-1.10.6-0.8.13
Current Version: 20240127-1.12.2-0.8.14

## From ztncui author

Expand All @@ -29,6 +29,8 @@ $ git clone https://github.com/kmahyyg/ztncui-aio
$ docker build . --build-arg OVERLAY_S6_ARCH=<one of aarch64,x86_64> -t ghcr.io/kmahyyg/ztncui-aio:latest
```

> Why not directly detect CPU arch? Some kernel may use non-standard expression of architecture.
Change `NODEJS_MAJOR` variable in Dockerfile to use different nodejs version.

Never use `node_lts.x` as your installation script of nodejs whose version might changed without further notice due to time shift.
Expand Down

0 comments on commit 869babd

Please sign in to comment.