Skip to content

Commit

Permalink
refactor(nextcloud_test): Move Dockerfile init steps to separate scripts
Browse files Browse the repository at this point in the history
Signed-off-by: provokateurin <kate@provokateurin.de>
  • Loading branch information
provokateurin committed Jul 27, 2024
1 parent 003a069 commit 0aacd5d
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 26 deletions.
31 changes: 5 additions & 26 deletions packages/nextcloud_test/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,11 @@ FROM nextcloud:${SERVER_VERSION}-fpm-alpine AS nextcloud

WORKDIR /usr/src/nextcloud

RUN ./occ maintenance:install --admin-pass admin --admin-email admin@example.com
RUN ./occ config:system:set allow_local_remote_servers --value=true
RUN ./occ config:system:set trusted_domains 1 --value="*"
RUN ./occ config:system:set debug --value=true --type=boolean
RUN ./occ config:system:set loglevel --value=0 --type=integer

RUN ./occ app:disable password_policy
RUN OC_PASS="user1" ./occ user:add --password-from-env --display-name "User One" user1
RUN OC_PASS="user2" ./occ user:add --password-from-env --display-name "User Two" user2
RUN OC_PASS="demo" ./occ user:add --password-from-env --display-name "Demo" demo
RUN ./occ app:enable password_policy
ADD pre.sh /tmp
RUN /tmp/pre.sh

RUN (sh /entrypoint.sh php -S 0.0.0.0:80 &) && \
until curl -s -o /dev/null http://localhost/status.php; do true; done && \
# Do not setup the demo user here
for user in admin user1 user2; do curl -u "$user:$user" -H "ocs-apirequest: true" -s -o /dev/null http://localhost/ocs/v2.php/cloud/user; done

COPY static /usr/src/nextcloud/static
Expand Down Expand Up @@ -65,23 +55,12 @@ RUN curl -L "$DROP_ACCOUNT_URL" | tar -xz -C /
FROM nextcloud

COPY --from=cookbook /cookbook /usr/src/nextcloud/apps/cookbook
RUN ./occ app:enable cookbook

COPY --from=news /news /usr/src/nextcloud/apps/news
RUN ./occ app:enable news

COPY --from=notes /notes /usr/src/nextcloud/apps/notes
RUN ./occ app:enable notes

COPY --from=uppush /uppush /usr/src/nextcloud/apps/uppush
RUN ./occ app:enable uppush

COPY --from=spreed /spreed /usr/src/nextcloud/apps/spreed
RUN ./occ app:enable spreed
RUN ./occ talk:turn:add turn,turns staticauth.openrelay.metered.ca:443 udp,tcp --secret openrelayprojectsecret

COPY --from=tables /tables /usr/src/nextcloud/apps/tables
RUN ./occ app:enable tables

COPY --from=drop_account /drop_account /usr/src/nextcloud/apps/drop_account
RUN ./occ app:enable drop_account

ADD post.sh /tmp
RUN /tmp/post.sh
11 changes: 11 additions & 0 deletions packages/nextcloud_test/docker/post.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh
set -eux

./occ app:enable cookbook "$@"
./occ app:enable news "$@"
./occ app:enable notes "$@"
./occ app:enable uppush "$@"
./occ app:enable spreed "$@"
./occ talk:turn:add turn,turns staticauth.openrelay.metered.ca:443 udp,tcp --secret openrelayprojectsecret
./occ app:enable tables "$@"
./occ app:enable drop_account "$@"
13 changes: 13 additions & 0 deletions packages/nextcloud_test/docker/pre.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sh
set -eux

./occ maintenance:install --admin-pass admin --admin-email admin@example.com
./occ config:system:set allow_local_remote_servers --value=true
./occ config:system:set trusted_domains 1 --value="*"
./occ config:system:set debug --value=true --type=boolean
./occ config:system:set loglevel --value=0 --type=integer

./occ app:disable password_policy
OC_PASS="user1" ./occ user:add --password-from-env --display-name "User One" user1
OC_PASS="user2" ./occ user:add --password-from-env --display-name "User Two" user2
./occ app:enable password_policy

0 comments on commit 0aacd5d

Please sign in to comment.