Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add NEXTCLOUD_INIT_LOCK to enable shared html volume update #1760

Merged
merged 1 commit into from
Jun 7, 2022
Merged

Add NEXTCLOUD_INIT_LOCK to enable shared html volume update #1760

merged 1 commit into from
Jun 7, 2022

Conversation

skjnldsv
Copy link
Member

@skjnldsv skjnldsv commented May 31, 2022 •
edited
Loading

cc @meonkeys

Fix #1742
Closes #1757

Easy reproducibility test

  1. Clone this repo
  2. Copy the docker-entrypoint.sh into 24/apache/entrypoint.sh
  3. Change current directory for 24/apache
  4. Edit the Dockerfile to 
    FROM nextcloud:apache

COPY *.sh upgrade.exclude /
  
ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"]
  5. Build the image docker build . and save the built image hash (here 6e7615a878a6)
    image
  6. Create a dummy folder mkdir /tmp/ncdocker
  7. Open two cosole and run this command at the same time in each shells (replace the hash by yours) 
    docker run -e NEXTCLOUD_INIT_LOCK=true -e NEXTCLOUD_ADMIN_USER=admin \
  -e NEXTCLOUD_ADMIN_PASSWORD=admin -e SQLITE_DATABASE=true \
  -v /tmp/ncdocker:/var/www/html 6e7615a878a6
  8. See one of the two processes waiting for the other to complete
Without NEXTCLOUD_INIT_LOCK With NEXTCLOUD_INIT_LOCK=true
image image

@skjnldsv skjnldsv added the bug label May 31, 2022
@skjnldsv skjnldsv requested a review from J0WI May 31, 2022 07:41
@skjnldsv skjnldsv self-assigned this May 31, 2022
@skjnldsv skjnldsv force-pushed the feat/config-flag-init branch from ac8a4ec to 83d5e72 Compare June 1, 2022 06:18
@skjnldsv skjnldsv mentioned this pull request Jun 2, 2022
Closed
8 tasks
@meonkeys
Copy link
Contributor

meonkeys commented Jun 7, 2022

I followed your steps and got the same result. LGTM!

@meonkeys meonkeys mentioned this pull request Jun 7, 2022
Closed
@skjnldsv skjnldsv merged commit ec3f7e5 into master Jun 7, 2022
@skjnldsv skjnldsv deleted the feat/config-flag-init branch June 7, 2022 12:26
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Jun 7, 2022
@docker-library-bot
Update nextcloud
f1e1bfc 
Changes:

- https///github.com/nextcloud/docker/commit/00d8873: Runs update.sh
- https///github.com/nextcloud/docker/commit/ec3f7e5: Merge pull request https///github.com/nextcloud/docker/pull/1760 from nextcloud/feat/config-flag-init
- https///github.com/nextcloud/docker/commit/83d5e72: Add `NEXTCLOUD_INIT_LOCK` to enable shared html volume update
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Jun 20, 2022
@docker-library-bot
Update nextcloud
0cc0d37 
Changes:

- https///github.com/nextcloud/docker/commit/c416385: Update Nextcloud to 24.0.2 (https///github.com/nextcloud/docker/pull/1773)
- https///github.com/nextcloud/docker/commit/e88d8e4: Merge pull request https///github.com/nextcloud/docker/pull/1739 from nextcloud/feat/workflow-auto-update-command-rebase.yml
- https///github.com/nextcloud/docker/commit/ce6a874: Updating command-rebase.yml workflow from template
- https///github.com/nextcloud/docker/commit/00d8873: Runs update.sh
- https///github.com/nextcloud/docker/commit/ec3f7e5: Merge pull request https///github.com/nextcloud/docker/pull/1760 from nextcloud/feat/config-flag-init
- https///github.com/nextcloud/docker/commit/83d5e72: Add `NEXTCLOUD_INIT_LOCK` to enable shared html volume update
neffets added a commit to neffets/docker-nextcloud that referenced this pull request Sep 3, 2022
@neffets
Merge branch 'master' of https://github.com/nextcloud/docker into nex…
82785fe 
…tcloud-master

GitHub Workflow and others added 24 commits 4 months ago
Runs update.sh
de57fc0

23.0.5 (nextcloud#1755)
Verified
d11d42b

Add NEXTCLOUD_INIT_LOCK to enable shared html volume update …
Verified
83d5e72

Merge pull request nextcloud#1760 from nextcloud/feat/config-flag-init
Verified
ec3f7e5
Runs update.sh
00d8873

Updating command-rebase.yml workflow from template …
ce6a874

Merge pull request nextcloud#1739 from nextcloud/feat/workflow-auto-update-com… …
Verified
e88d8e4

Update Nextcloud to 24.0.2 (nextcloud#1773) …
Verified
c416385

Add NEXTCLOUD_INIT_HTACCESS to run `occ maintenance:update:htaccess… …
Verified
209d65d
Runs update.sh
0eda450

Alpine 3.16 (nextcloud#1779) …
Verified
3df4ad5
Runs update.sh
66f397f


Use $PHP_INI_DIR var (nextcloud#1765) …
Verified
502fda1
Runs update.sh
941450c

stable 24.0.2 (nextcloud#1783)
Verified
fa31dab

Use $PHP_INI_DIR var (nextcloud#1790) …
Verified
cde0385
Runs update.sh
8cfb0e5

Bump stable channel (nextcloud#1792)
Verified
6e7695e

22 EOL (nextcloud#1800) …
Verified
8dd3d45
Runs update.sh
6d25698

24.0.4 (nextcloud#1804) …
Verified
b71e398

Remove 22 (nextcloud#1813) …
Verified
685803d

fix SMTP_PASSWORD_FILE not triggering auth activation (nextcloud#1614) …
Verified
d447c57
Runs update.sh
338b483
neffets added a commit to neffets/docker-nextcloud that referenced this pull request Sep 3, 2022
@neffets
Merge branch 'nextcloud-master'
87abe1d 
Runs update.sh
Add NEXTCLOUD_INIT_LOCK to enable shared html volume update
Merge pull request nextcloud#1760 from nextcloud/feat/config-flag-init
Updating command-rebase.yml workflow from template …
Merge pull request nextcloud#1739 from nextcloud/feat/workflow-auto-update-com… …
Add NEXTCLOUD_INIT_HTACCESS to run `occ maintenance:update:htaccess… …
Alpine 3.16 (nextcloud#1779) …
Use $PHP_INI_DIR var (nextcloud#1790) …
Nextcloud BUM stable channel (22 EOL) , we at STS support down to 20 (EOL notice for 20 and 21)
fix SMTP_PASSWORD_FILE not triggering auth activation (nextcloud#1614) …
This was referenced Jan 27, 2023
Closed
Closed
@meonkeys meonkeys mentioned this pull request Feb 8, 2023
Merged
@joshtrichards joshtrichards mentioned this pull request Oct 21, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@meonkeys meonkeys meonkeys left review comments

@J0WI J0WI Awaiting requested review from J0WI

Assignees

@skjnldsv skjnldsv

Labels
bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug]: Upgrade 23.0.3 to 23.0.4 docker Server does not migrate
2 participants
@skjnldsv @meonkeys