diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b25c15b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*~ diff --git a/Dockerfile-apache-smb b/Dockerfile-apache-smb index fdd4df9..b4f41c6 100644 --- a/Dockerfile-apache-smb +++ b/Dockerfile-apache-smb @@ -1,3 +1,3 @@ ARG VERSION FROM nextcloud:$VERSION-apache -RUN apt-get update && apt-get install -y procps smbclient libsmbclient-dev libmagickcore-6.q16-6-extra && pecl install smbclient && docker-php-ext-enable smbclient && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y procps smbclient libmagickcore-6.q16-6-extra && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile-fpm-alpine-smb b/Dockerfile-fpm-alpine-smb index ad85430..4ae047d 100644 --- a/Dockerfile-fpm-alpine-smb +++ b/Dockerfile-fpm-alpine-smb @@ -1,3 +1,3 @@ ARG VERSION FROM nextcloud:$VERSION-fpm-alpine -RUN apk add --no-cache samba-dev build-base php82-dev libsmbclient imagemagick-svg && pecl install smbclient && apk del php82-dev build-base samba-dev && docker-php-ext-enable smbclient && docker-php-ext-install ftp +RUN apk add --no-cache procps samba-client imagemagick diff --git a/Dockerfile-fpm-smb b/Dockerfile-fpm-smb index d458dea..615a18e 100644 --- a/Dockerfile-fpm-smb +++ b/Dockerfile-fpm-smb @@ -1,3 +1,3 @@ ARG VERSION FROM nextcloud:$VERSION-fpm -RUN apt-get update && apt-get install -y procps smbclient libsmbclient-dev libmagickcore-6.q16-6-extra && pecl install smbclient && docker-php-ext-enable smbclient && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y procps smbclient libmagickcore-6.q16-6-extra && rm -rf /var/lib/apt/lists/* diff --git a/build.sh b/build.sh index c65a0f1..cbbc2e3 100755 --- a/build.sh +++ b/build.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -v=29.0.8 +v=30.0.1 v2=$(echo $v | sed "s/\(.*\)\.\(.*\)\.\(.*\)/\1.\2/") v3=$(echo $v | sed "s/\(.*\)\.\(.*\)\.\(.*\)/\1/") -for t in apache fpm fpm-alpine +for t in fpm-alpine apache fpm do docker build -f Dockerfile-$t-smb -t salfter/nextcloud:$v-$t-smb --build-arg VERSION=$v . for vt in $v $v2 $v3 stable production