diff --git a/.github/workflows/ci-dockerhub.yml b/.github/workflows/ci-dockerhub.yml index bc007dc..2fcb325 100644 --- a/.github/workflows/ci-dockerhub.yml +++ b/.github/workflows/ci-dockerhub.yml @@ -1,3 +1,7 @@ +# amd64 only: +# docker buildx build --push --platform linux/amd64 --tag xxx/xxx:latest +# multiplatform: +# docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64,linux/386 --tag xxx/xxx:latest name: ci-dockerhub on: @@ -29,6 +33,6 @@ jobs: uses: docker/build-push-action@v3 with: context: . - platforms: linux/arm/v7,linux/arm64/v8,linux/amd64,linux/386 + platforms: linux/amd64 push: true tags: filegator/filegator:latest, filegator/filegator:${{ github.ref_name }} diff --git a/Dockerfile b/Dockerfile index 5fb9fb5..73b3299 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,10 +32,11 @@ RUN rm -rf node_modules frontend tests docs .git* FROM php:7-apache-buster RUN apt-get update > /dev/null -RUN apt-get install -y git libzip-dev +RUN apt-get install -y git libzip-dev libldap2-dev -RUN docker-php-ext-install zip -RUN docker-php-ext-enable zip +RUN docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ +RUN docker-php-ext-install zip ldap +RUN docker-php-ext-enable zip ldap COPY --from=builder /var/www/filegator /var/www/filegator RUN chown -R www-data:www-data /var/www/filegator/