Skip to content

Commit

Permalink
Merge branch 'main' into rootless_shadow
Browse files Browse the repository at this point in the history
  • Loading branch information
madelen-at-work committed Mar 7, 2024
2 parents 9642900 + 4781797 commit 96a83f7
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
id: vars
run: echo "TAG=${GITHUB_REF#refs/*/}" >> ${GITHUB_ENV}
- name: Create prerelease
uses: actions/github-script@v6
uses: actions/github-script@v7
id: prerelease
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ jobs:
fetch-depth: 0

- name: Lint codebase
uses: github/super-linter/slim@v5
uses: super-linter/super-linter/slim@v5
env:
VALIDATE_ALL_CODEBASE: true
DEFAULT_BRANCH: main
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
LINTER_RULES_PATH: /
IGNORE_GITIGNORED_FILES: true
VALIDATE_BASH: true
VALIDATE_CLANG_FORMAT: true
VALIDATE_DOCKERFILE_HADOLINT: true
VALIDATE_MARKDOWN: true
VALIDATE_SHELL_SHFMT: true
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG DOCKER_IMAGE_VERSION=24.0.2
ARG REPO=axisecp
ARG ACAPARCH=armv7hf

ARG VERSION=1.10
ARG VERSION=1.3
ARG UBUNTU_VERSION=22.04
ARG NATIVE_SDK=acap-native-sdk

Expand Down
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,17 @@ note that you need to enclose your password with quotes (`'`) if it contains spe
## Installation and Usage

The Docker ACAP application is available as a **signed** eap-file in [Releases][latest-releases].

> [!IMPORTANT]
> From AXIS OS 11.8 `root` user is not allowed by default and in 12.0 it will be disallowed completely. Read more on the [Developer Community](https://www.axis.com/developer-community/news/axis-os-root-acap-signing). \
> Docker ACAP 1.X requires root and work is ongoing to create a version that does not.
> Meanwhile, the solution is to allow root to be able to install the Docker ACAP.
>
> On the web page of the device:
>
> 1. Go to the Apps page, toggle on `Allow root-privileged apps`.
> 1. Go to System -> Account page, under SSH accounts toggle off `Restrict root access` to be able to send the TLS certificates. Make sure to set the password of the `root` SSH user.
The prebuilt Docker ACAP application is signed, read more about signing [here][signing-documentation].

### Installation
Expand Down
2 changes: 1 addition & 1 deletion app/dockerdwrapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ dockerd_process_exited_callback(__attribute__((unused)) GPid pid,
__attribute__((unused)) gpointer user_data)
{
GError *error = NULL;
if (!g_spawn_check_wait_status(status, &error)) {
if (!g_spawn_check_exit_status(status, &error)) {
syslog(LOG_ERR, "Dockerd process exited with error: %d", status);
g_clear_error(&error);

Expand Down

0 comments on commit 96a83f7

Please sign in to comment.