Skip to content

Commit

Permalink
Merge pull request #8 from linuxserver-labs/commits
Browse files Browse the repository at this point in the history
build commits to master
  • Loading branch information
aptalca authored May 10, 2023
2 parents 140ac34 + a4d7f6f commit f597cf4
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/call-baseimage-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
uses: linuxserver-labs/docker-actions/.github/workflows/check-baseimage-update.yml@v6
with:
repo_owner: ${{ github.repository_owner }}
baseimage: "rdesktop-web"
basebranch: "jammy"
baseimage: "kasmvnc"
basebranch: "ubuntujammy"
app_name: "nomacs"
secrets:
repo_release_token: ${{ secrets.repo_release_token }}
4 changes: 2 additions & 2 deletions .github/workflows/call-build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
with:
repo_owner: ${{ github.repository_owner }}
app_name: "nomacs"
release_type: "github_tag"
release_url: "https://api.github.com/repos/nomacs/nomacs"
release_type: "github_commit"
release_url: "https://api.github.com/repos/nomacs/nomacs/commits/master"
release_name: ""
target-arch: "64"
secrets:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/call-check-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
with:
repo_owner: ${{ github.repository_owner }}
app_name: "nomacs"
release_type: "github_tag"
release_url: "https://api.github.com/repos/nomacs/nomacs"
release_type: "github_commit"
release_url: "https://api.github.com/repos/nomacs/nomacs/commits/master"
release_name: ""
secrets:
repo_release_token: ${{ secrets.repo_release_token }}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ RUN \
make install && \
echo "**** compile nomacs ****" && \
if [ -z "${APP_VERSION}" ]; then \
APP_VERSION=$(curl -sX GET https://api.github.com/repos/nomacs/nomacs/tags | jq -r '.[0] | .name'); \
APP_VERSION=$(curl -sX GET https://api.github.com/repos/nomacs/nomacs/commits/master | jq -r '. | .sha' | cut -c1-8); \
fi && \
mkdir -p /tmp/nomacs && \
git clone --recurse-submodules https://github.com/nomacs/nomacs.git /tmp/nomacs && \
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **27.03.22:** - Rebase to the new kasmvnc baseimage. Deprecate arm32v7 build as the new base does not support it.
* **10.05.23:** - Build commits from upstream master branch.
* **27.03.23:** - Rebase to the new kasmvnc baseimage. Deprecate arm32v7 build as the new base does not support it.
* **10.12.22:** - Add support for AVIF and JPEG XL.
* **12.10.22:** - Initial Release.

0 comments on commit f597cf4

Please sign in to comment.