diff options
author | Tobias Knöppler <6317548+theCalcaholic@users.noreply.github.com> | 2022-05-05 03:13:24 +0300 |
---|---|---|
committer | Tobias K <6317548+theCalcaholic@users.noreply.github.com> | 2022-05-05 19:10:53 +0300 |
commit | ab63f947f7341ecb5914b6025f2e0501c905db36 (patch) | |
tree | 8a7518001f09d5c400e9d75e5357640e302348ec | |
parent | 42df5736d6b94080b27dbbdbc295222646984f2b (diff) | |
parent | 6692663907eae78c510aa56105523e6176557416 (diff) |
docker-build.yml: Implement workaround for ssl mutex bug on qemu/arm64 docker container
-rw-r--r-- | .github/workflows/build-docker.yml | 8 | ||||
-rwxr-xr-x | build/build-docker.sh | 2 | ||||
-rw-r--r-- | build/docker/Dockerfile | 4 | ||||
-rw-r--r-- | changelog.md | 9 |
4 files changed, 16 insertions, 7 deletions
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index dc2e96b6..6711bb99 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -7,7 +7,7 @@ name: 'Docker Integration Tests and Release' on: push: branches: - - "*" + - "**" tags: - 'v*' @@ -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 diff --git a/changelog.md b/changelog.md index 0d2ae53d..b0a2f84e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,8 @@ +* [tag: v1.47.2](https://github.com/nextcloud/nextcloudpi/commit/1f58fa7) (2022-05-05) docker-build.yml: Implement workaround for ssl mutex bug on qemu/arm64 docker container -[v1.47.1](https://github.com/nextcloud/nextcloudpi/commit/9563367) (2022-04-13) library.sh: Prevent systemd pager from blocking script execution - -[v1.47.0](https://github.com/nextcloud/nextcloudpi/commit/1ce2135) (2022-04-08) metrics.sh: Add docker support and custom metrics exporter +[v1.47.1 ](https://github.com/nextcloud/nextcloudpi/commit/9663ef7) (2022-04-13) system_tests.py: Remove deprecated wicd_curses check +| +[v1.47.0, feature/custom-prometheus-exporter](https://github.com/nextcloud/nextcloudpi/commit/d42a0c8) (2022-04-08) metrics.sh: Reinstall metrics when upgrading [v1.46.10](https://github.com/nextcloud/nextcloudpi/commit/99a3c45) (2022-03-26) dnsmasq.sh: Workaround dnsmasq startup failure bug @@ -197,7 +198,7 @@ [v1.37.0 ](https://github.com/nextcloud/nextcloudpi/commit/effdd6c) (2021-07-03) upgrade to NC20.0.11 -[v1.36.3, master](https://github.com/nextcloud/nextcloudpi/commit/7b809d1) (2021-05-13) ncp-web: fix port checking for IPv6 dual stack +[v1.36.3 ](https://github.com/nextcloud/nextcloudpi/commit/7b809d1) (2021-05-13) ncp-web: fix port checking for IPv6 dual stack [v1.36.2 ](https://github.com/nextcloud/nextcloudpi/commit/1a8ac71) (2021-05-11) ncp-web: fix port checking |