container/nextcloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ensure installed is false when running installer

Browse Source
This commit is contained in:
Sebastian Hugentobler 2017-06-15 11:46:12 +02:00
parent d4e0cba2c1
commit cb524cb098
3 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -19,6 +19,7 @@ RUN apk add --no-cache \
php7-json \ php7-json \
php7-xml \ php7-xml \
php7-xmlreader \ php7-xmlreader \
php7-xmlwriter \
php7-zlib \ php7-zlib \
php7-zip \ php7-zip \
php7-pgsql \ php7-pgsql \
@ -33,7 +34,8 @@ RUN apk add --no-cache \
php7-bz2 \ php7-bz2 \
php7-exif \ php7-exif \
php7-apcu \ php7-apcu \
php7-ldap php7-ldap \
php7-simplexml
RUN mkdir /var/lib/nextcloud RUN mkdir /var/lib/nextcloud
RUN wget -qO- https://download.nextcloud.com/server/releases/nextcloud-$VERSION.tar.bz2 | tar xj -C /var/lib/nextcloud --strip 1 RUN wget -qO- https://download.nextcloud.com/server/releases/nextcloud-$VERSION.tar.bz2 | tar xj -C /var/lib/nextcloud --strip 1

2
rootfs/etc/confd/templates/config.php.tmpl
View File

@ -53,5 +53,5 @@ $CONFIG = array(
'assetdirectory' => '/var/lib/nextcloud', 'assetdirectory' => '/var/lib/nextcloud',
'mount_file' => '/var/lib/nextcloud/data/mount.json', 'mount_file' => '/var/lib/nextcloud/data/mount.json',
'installed' => true, 'installed' => true,
'version' => '12.0.0', 'version' => '12.0.0.29',
); );

42
rootfs/etc/cont-init.d/00-nextcloud
View File

@ -11,7 +11,9 @@ PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_NAME -c "SELECT EXIS
if [ $? -ne 1 ]; then if [ $? -ne 1 ]; then
cd /var/lib/nextcloud cd /var/lib/nextcloud
sed -i -e "s/'installed' => true,/'installed' => false,/g" /var/lib/nextcloud/config/config.php
s6-setuidgid nginx ./occ maintenance:install \ s6-setuidgid nginx ./occ maintenance:install \
--database=pgsql \ --database=pgsql \
--database-host=$DB_HOST \ --database-host=$DB_HOST \
@ -28,23 +30,23 @@ if [ $? -ne 1 ]; then
s6-setuidgid nginx ./occ ldap:create-empty-config s6-setuidgid nginx ./occ ldap:create-empty-config
s6-setuidgid nginx ./occ ldap:set-config '' hasMemberOfFilterSupport "1" s6-setuidgid nginx ./occ ldap:set-config 's01' hasMemberOfFilterSupport "1"
s6-setuidgid nginx ./occ ldap:set-config '' ldapExperiencedAdmin "1" s6-setuidgid nginx ./occ ldap:set-config 's01' ldapExperiencedAdmin "1"
s6-setuidgid nginx ./occ ldap:set-config '' ldapIgnoreNamingRules "1" s6-setuidgid nginx ./occ ldap:set-config 's01' ldapIgnoreNamingRules "1"
s6-setuidgid nginx ./occ ldap:set-config '' ldapHost "$LDAP_HOST" s6-setuidgid nginx ./occ ldap:set-config 's01' ldapHost "$LDAP_HOST"
s6-setuidgid nginx ./occ ldap:set-config '' ldapPort "$LDAP_PORT" s6-setuidgid nginx ./occ ldap:set-config 's01' ldapPort "$LDAP_PORT"
s6-setuidgid nginx ./occ ldap:set-config '' ldapTLS "$LDAP_TLS" s6-setuidgid nginx ./occ ldap:set-config 's01' ldapTLS "$LDAP_TLS"
s6-setuidgid nginx ./occ ldap:set-config '' ldapAgentName "$LDAP_BIND_USER" s6-setuidgid nginx ./occ ldap:set-config 's01' ldapAgentName "$LDAP_BIND_USER"
s6-setuidgid nginx ./occ ldap:set-config '' ldapAgentPassword "$LDAP_BIND_PASSWORD" s6-setuidgid nginx ./occ ldap:set-config 's01' ldapAgentPassword "$LDAP_BIND_PASSWORD"
s6-setuidgid nginx ./occ ldap:set-config '' ldapLoginFilter "$LDAP_LOGIN_FILTER" s6-setuidgid nginx ./occ ldap:set-config 's01' ldapLoginFilter "$LDAP_LOGIN_FILTER"
s6-setuidgid nginx ./occ ldap:set-config '' ldapUserDisplayName "$LDAP_USER_DISPLAY_NAME" s6-setuidgid nginx ./occ ldap:set-config 's01' ldapUserDisplayName "$LDAP_USER_DISPLAY_NAME"
s6-setuidgid nginx ./occ ldap:set-config '' ldapUserFilter "$LDAP_USER_FILTER" s6-setuidgid nginx ./occ ldap:set-config 's01' ldapUserFilter "$LDAP_USER_FILTER"
s6-setuidgid nginx ./occ ldap:set-config '' ldapBase "$LDAP_BASE_DN" s6-setuidgid nginx ./occ ldap:set-config 's01' ldapBase "$LDAP_BASE_DN"
s6-setuidgid nginx ./occ ldap:set-config '' ldapBaseUsers "$LDAP_BASE_USER_DN" s6-setuidgid nginx ./occ ldap:set-config 's01' ldapBaseUsers "$LDAP_BASE_USER_DN"
s6-setuidgid nginx ./occ ldap:set-config '' ldapEmailAttribute "$LDAP_EMAIL_ATTRIBUTE" s6-setuidgid nginx ./occ ldap:set-config 's01' ldapEmailAttribute "$LDAP_EMAIL_ATTRIBUTE"
s6-setuidgid nginx ./occ ldap:set-config '' ldapBaseGroups "$LDAP_BASE_GROUP_DN" s6-setuidgid nginx ./occ ldap:set-config 's01' ldapBaseGroups "$LDAP_BASE_GROUP_DN"
s6-setuidgid nginx ./occ ldap:set-config '' ldapGroupFilter "$LDAP_GROUP_FILTER" s6-setuidgid nginx ./occ ldap:set-config 's01' ldapGroupFilter "$LDAP_GROUP_FILTER"
s6-setuidgid nginx ./occ ldap:set-config '' ldapExpertUsernameAttr "$LDAP_USERNAME_ATTRIBUTE" s6-setuidgid nginx ./occ ldap:set-config 's01' ldapExpertUsernameAttr "$LDAP_USERNAME_ATTRIBUTE"
s6-setuidgid nginx ./occ ldap:set-config '' turnOffCertCheck "$LDAP_TURN_OFF_CERT_CHECK" s6-setuidgid nginx ./occ ldap:set-config 's01' turnOffCertCheck "$LDAP_TURN_OFF_CERT_CHECK"
s6-setuidgid nginx ./occ ldap:set-config '' ldapConfigurationActive "1" s6-setuidgid nginx ./occ ldap:set-config 's01' ldapConfigurationActive "1"
fi fi