External-Mirrors/nextcloudpi
2
0
Fork 0
mirror of https://github.com/nextcloud/nextcloudpi.git synced 2026-01-10 15:12:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Dockerfile, build-docker.yml: Add workaround for failing arm64 container when run via qemu

Browse Source 
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
This commit is contained in:
Tobias K 2022-05-05 01:30:02 +02:00
parent 42df5736d6
commit 5e8193456e
No known key found for this signature in database
GPG Key ID: 3510056072886A8F
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build-docker.yml vendored
View File

@ -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

2
build/build-docker.sh
View File

@ -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

4
build/docker/Dockerfile
View File

@ -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