diff options
| author | Tobias K <6317548+theCalcaholic@users.noreply.github.com> | 2022-05-05 02:30:02 +0300 |
|---|---|---|
| committer | Tobias K <6317548+theCalcaholic@users.noreply.github.com> | 2022-05-05 02:30:02 +0300 |
| commit | 5e8193456eb3268b421df87108732d821408a6ca (patch) | |
| tree | acb2031f1dde794a252714ef49aad0305b7015b3 | |
| parent | 42df5736d6b94080b27dbbdbc295222646984f2b (diff) | |
Dockerfile, build-docker.yml: Add workaround for failing arm64 container when run via qemu
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
| -rw-r--r-- | .github/workflows/build-docker.yml | 6 | ||||
| -rwxr-xr-x | build/build-docker.sh | 2 | ||||
| -rw-r--r-- | build/docker/Dockerfile | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index dc2e96b6..77c85c24 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -40,7 +40,11 @@ jobs: run: | ./build/build-docker.sh "${{ matrix.arch }}" docker tag "ownyourbits/nextcloudpi-${{ matrix.arch }}:latest" "thecalcaholic/ncp-internal-${{ matrix.arch }}:${{ github.run_id }}" + testing_image="ownyourbits/nextcloudpi-${{ matrix.arch }}:latest" + [[ "${{ matrix.arch }}" == "arm64" ]] && testing_image="ownyourbits/ncp-qemu-fix-${{ matrix.arch }}:latest" + docker tag "${testing_image}" "thecalcaholic/ncp-internal-${{ matrix.arch }}:${{ github.run_id }}-testing" docker push "thecalcaholic/ncp-internal-${{ matrix.arch }}:${{ github.run_id }}" + docker push "thecalcaholic/ncp-internal-${{ matrix.arch }}:${{ github.run_id }}-testing" test: needs: @@ -63,7 +67,7 @@ jobs: echo "${{ secrets.DOCKER_PASSWORD_INTERNAL }}" | docker login -u "${{ secrets.DOCKER_LOGIN_INTERNAL }}" --password-stdin - name: Start ncp container run: | - docker run -d --rm -p 8443:443 -p 4443:4443 --name nextcloudpi thecalcaholic/ncp-internal-${{ matrix.arch }}:${{ github.run_id }} + docker run -d --rm -p 8443:443 -p 4443:4443 --name nextcloudpi thecalcaholic/ncp-internal-${{ matrix.arch }}:${{ github.run_id }}-testing - name: Checkout code uses: actions/checkout@v3 diff --git a/build/build-docker.sh b/build/build-docker.sh index 6a6ebf5c..a6a35931 100755 --- a/build/build-docker.sh +++ b/build/build-docker.sh @@ -51,7 +51,7 @@ clean_workspace() { # Pull latest image for caching docker pull ownyourbits/nextcloudpi - for target in qemu nextcloudpi debian-ncp lamp nextcloud + for target in qemu nextcloudpi debian-ncp lamp nextcloud ncp-qemu-fix do build_arch "$target" "${release}" "${arch_args[@]}" done diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index f2ec6904..7b6c2273 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -186,3 +186,7 @@ rm /var/cache/debconf/*-old; \ echo "${ncp_ver}" > /usr/local/etc/ncp-version COPY build/docker/nextcloudpi/000ncp /etc/services-enabled.d/ + +FROM --platform=linux/${arch_qemu} nextcloudpi as ncp-qemu-fix + +RUN echo 'Mutex posixsem' >> /etc/apache2/mods-available/ssl.conf |