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

build: add NC compose setup to use specific server branch #776

Open
wants to merge 2 commits into
base: release/2.8
Choose a base branch
from
Open

build: add NC compose setup to use specific server branch #776

wants to merge 2 commits into from

Conversation

saw-jan
Copy link
Collaborator

@saw-jan saw-jan commented Feb 25, 2025 •
edited
Loading

Description

  • use ghcr.io/juliusknorr/nextcloud-dev-php83:master docker image instead of nextcloud/apache
  • following envs are available to change the image while running the setup
    • NEXTCLOUD_IMAGE_PHP - php version to use (default: 83. see available list)
    • NEXTCLOUD_IMAGE_TAG - image tag to use (default: master)
  • configure nextcloud branch using NEXTCLOUD_BRANCH

Related Issue or Workpackage

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Updated CHANGELOG.md file

@saw-jan saw-jan marked this pull request as ready for review February 25, 2025 08:45
@saw-jan saw-jan self-assigned this Feb 25, 2025
@saw-jan saw-jan added the backport PR needs backporting label Feb 25, 2025
@github-actions GitHub Actions
Copy link

JS Code Coverage

Coverage after merging dev/support-any-nc-branch into release/2.8 will be
87.78%
Coverage Report
FileStmtsBranchesFuncsLinesUncovered Lines
src
   adminSettings.js0%0%0%0%1, 1, 10–19, 2, 20–25, 3–9
   bootstrap.js0%0%0%0%1, 1–7
   dashboard.js0%0%0%0%1, 1, 10–19, 2, 20–25, 3–9
   fileActions.js0%0%0%0%1, 1, 10–17, 2–9
   personalSettings.js0%0%0%0%1, 1, 10–19, 2, 20–25, 3–9
   projectTab.js0%0%0%0%1, 1, 10–19, 2, 20–29, 3, 30–39, 4, 40–49, 5, 50–59, 6, 60–66, 7–9
   reference.js0%0%0%0%1, 1, 10–19, 2, 20–29, 3, 30–39, 4, 40–49, 5, 50–59, 6, 60, 7–9
   utils.js71.43%33.33%50%73.85%10–14, 17–26, 6–9
src/components
   AdminSettings.vue96.24%94.08%95.31%96.58%1018–1020, 1055–1058, 1094–1096, 1116–1119, 527–528, 676, 688–690, 702, 702, 702–707, 710–711, 715–716, 719–720, 724–725, 735–740, 801–803, 815–818, 831–833
   OAuthConnectButton.vue91.54%75%100%92.98%59–64, 67–71
   PersonalSettings.vue90.16%94.44%85.71%89.88%100, 110–115, 118–127, 99
src/components/admin
   FieldValue.vue100%100%100%100%
   FormHeading.vue100%100%100%100%
   TermsOfServiceUnsigned.vue100%100%100%100%
   TextInput.vue100%100%100%100%
src/components/icons
   ClippyIcon.vue100%100%100%100%
   OpenProjectIcon.vue100%100%100%100%
src/components/settings
   CheckBox.vue100%100%100%100%
   SettingsTitle.vue96.74%85.71%100%97.53%46–48
src/components/tab
   EmptyContent.vue96.65%83.33%100%98.06%87–90, 92–93
   SearchInput.vue95.27%92.96%94.74%95.73%134–135, 188, 199–204, 263–265, 281–283, 287–292
   WorkPackage.vue86.07%73.17%93.33%87.42%102–111, 124–126, 137–141, 151–153, 171–177, 215, 215–220, 220, 220–231, 76–77
src/filesPlugin
   filesPlugin.js0%0%0%0%1, 1, 10, 100–104, 11–19, 2, 20–29, 3, 30–39, 4, 40–49, 5, 50–59, 6, 60–69, 7, 70–79, 8, 80–89, 9, 90–99
   filesPluginLessThan28.js0%0%0%0%1, 1, 10–19, 2, 20–29, 3, 30–39, 4, 40–49, 5, 50–59, 6, 60–69, 7, 70–78, 8–9
src/utils
   workpackageHelper.js93.68%93.10%88.89%94.09%18–22, 49, 49–51, 92–97
src/views
   CreateWorkPackageModal.vue94.38%86.54%91.67%95.55%353–355, 358, 459–462, 467–472, 477–482, 488–491, 494, 510, 510, 551–555, 565–567, 586–588, 617–619, 641–643, 652–656
   Dashboard.vue77.46%80.39%61.90%78.09%103–108, 115, 119–120, 125, 128, 131–134, 139–141, 183–189, 195–198, 200–210, 239–247, 260–274, 51, 63, 88–91, 98–99
   LinkMultipleFilesModal.vue100%100%100%100%
   ProjectsTab.vue94.92%94.23%93.33%95.08%113–116, 142, 153–154, 188–198, 247–249

@github-actions GitHub Actions
Copy link

PHP Code Coverage

Coverage after merging dev/support-any-nc-branch into release/2.8 will be
60.54%
Coverage Report
FileStmtsBranchesFuncsLinesUncovered Lines
server/apps/integration_openproject/lib
   Capabilities.php0%100%0%0%19, 26–35
   ServerVersionHelper.php0%100%0%0%17–18, 21, 24
server/apps/integration_openproject/lib/AppInfo
   Application.php7.41%100%25%6%102, 104–107, 109, 111, 113, 117–120, 122–133, 135, 138, 142, 146–148, 75–77, 80–84, 86–91, 93–94, 97
server/apps/integration_openproject/lib/BackgroundJob
   RemoveExpiredDirectUploadTokens.php0%100%0%0%42, 44–46, 55–56
server/apps/integration_openproject/lib/Controller
   ConfigController.php64.76%100%50%65.37%136, 153–154, 156, 158–160, 162–165, 168–169, 171, 213, 223, 227–229, 293–297, 407–409, 411–413, 418–421, 462, 550–553, 555–556, 559, 567–571, 582, 596–599, 607–608, 612–615, 629–633, 635–636, 638–654, 671–676, 678–679, 681–683, 686, 688–704, 717–724, 726–729, 731–735, 744–749
   DirectDownloadController.php0%100%0%0%37–39, 54–56, 58–65
   DirectUploadController.php70.83%100%100%70%141–143, 186–188, 199, 203–206, 208, 218, 225, 241–243, 245–246, 249–254, 257, 259, 267–269, 275–277, 285–287, 302–304, 323, 328, 334
   FilesController.php72.95%100%83.33%72.41%182–183, 245, 250–253, 255, 257–270, 273–274, 276–277, 281–284, 287, 293
   OpenProjectAPIController.php76.02%100%81.25%75.56%139, 162, 188–191, 194–201, 203–207, 209, 221, 230, 248, 257, 325, 327, 376, 378, 397, 399, 445, 447, 472–475, 478–482, 484, 56, 99
   OpenProjectController.php96.45%100%80%96.95%241–245
server/apps/integration_openproject/lib/Dashboard
   OpenProjectWidget.php0%100%0%0%102, 109, 116–117, 119, 121–138, 70–74, 81, 88, 95
server/apps/integration_openproject/lib/Exception
   OpenprojectAvatarErrorException.php100%100%100%100%
   OpenprojectErrorException.php100%100%100%100%
   OpenprojectFileNotUploadedException.php100%100%100%100%
   OpenprojectGroupfolderSetupConflictException.php100%100%100%100%
   OpenprojectResponseException.php100%100%100%100%
   OpenprojectUnauthorizedUserException.php0%100%0%0%16
server/apps/integration_openproject/lib/Listener
   BeforeGroupDeletedListener.php0%100%0%0%48, 56–57, 60–63, 65
   BeforeNodeInsideOpenProjectGroupfilderChangedListener.php0%100%0%0%41–43, 47–50, 52, 54, 57–58, 60, 62–65, 67–70, 72–74
   BeforeUserDeletedListener.php0%100%0%0%48, 55–56, 58–61, 63
   LoadAdditionalScriptsListener.php0%100%0%0%18–19, 21–23, 25
   LoadSidebarScript.php0%100%0%0%100, 102, 104–105, 107, 109, 111, 113–122, 75–91, 96–97, 99
   OpenProjectReferenceListener.php0%100%0%0%54–55, 58–59, 62–63, 65–68
   TermsOfServiceEventListener.php0%100%0%0%59–60, 65–66, 68–69, 71–73, 76–80
   UserChangedListener.php0%100%0%0%52, 59–60, 63–68, 71
server/apps/integration_openproject/lib/Migration
   Version2001Date20221213083550.php0%100%0%0%47, 57–65, 67–75, 77–79, 81
   Version2310Date20230116153411.php0%100%0%0%46, 49–52, 54–79, 81–82, 84
   Version2400Date20230504144300.php0%100%0%0%47, 57–60
   Version2640Date20240628114301.php0%100%0%0%52, 64–66, 69–70, 73
server/apps/integration_openproject/lib/Reference
   WorkPackageReferenceProvider.php51.67%100%25%58.33%102, 108–111, 114–116, 119, 123, 157, 165–166, 174, 52, 59, 66, 73–75
server/apps/integration_openproject/lib/Search
   OpenProjectSearchProvider.php0%100%0%0%103–104, 107–118, 121–122, 124–125, 128–137, 139–143, 66–69, 76, 83, 91, 93, 96
   OpenProjectSearchResultEntry.php100%100%100%100%
server/apps/integration_openproject/lib/Service
   DatabaseService.php42.31%100%60%40.43%100–102, 125–129, 131, 80–93, 95–99
   DirectDownloadService.php88.46%100%100%87.50%66–67, 69
   DirectUploadService.php42.86%100%66.67%40%112, 118, 79–82, 84–92
   OauthService.php32.08%100%40%31.25%104–112, 123–130, 79–87, 89–95
   OpenProjectAPIService.php75.82%100%76.36%75.77%1040–1042, 1044–1046, 1049–1053, 1055–1057, 1066–1069, 1072–1074, 1076, 1079–1084, 1088–1089, 1120–1123, 1142–1149, 1165–1166, 1173–1175, 1177–1180, 1184, 1193, 1211, 1213–1216, 1218–1223, 1365, 1377, 1380, 1400, 1403, 1413–1418, 1543–1545, 1547–1548, 1552–1553, 1555,

nabim777
nabim777 reviewed Feb 25, 2025
View reviewed changes
dev/compose.yaml
Comment on lines +93 to +97
SQL: pgsql
VIRTUAL_HOST: nextcloud
SERVER_BRANCH: ${NEXTCLOUD_BRANCH:-stable31}
NEXTCLOUD_AUTOINSTALL: YES
NEXTCLOUD_TRUSTED_DOMAINS: nextcloud.local
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
SQL: pgsql
VIRTUAL_HOST: nextcloud
SERVER_BRANCH: ${NEXTCLOUD_BRANCH:-stable31}
NEXTCLOUD_AUTOINSTALL: YES
NEXTCLOUD_TRUSTED_DOMAINS: nextcloud.local
SQL: pgsql
VIRTUAL_HOST: nextcloud
SERVER_BRANCH: ${NEXTCLOUD_BRANCH:-stable31}
NEXTCLOUD_AUTOINSTALL: YES
NEXTCLOUD_TRUSTED_DOMAINS: nextcloud.local
NEXTCLOUD_AUTOINSTALL_APPS:

Can we add this in the env? this will automatically enable the apps
NEXTCLOUD_AUTOINSTALL_APPS

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nabim777 nabim777 nabim777 left review comments

@individual-it individual-it Awaiting requested review from individual-it

At least 1 approving review is required to merge this pull request.

Assignees

@saw-jan saw-jan

Labels
backport PR needs backporting
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@saw-jan @nabim777