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

feat: drop support of Nextcloud 27 #374

Merged
merged 1 commit into from
Sep 4, 2024
Merged

feat: drop support of Nextcloud 27 #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,20 @@ help:
@echo " "
@echo " Next commands are only for dev environment with nextcloud-docker-dev!"
@echo " Daemon register(Linux, socket):"
@echo " dock-sock create docker daemon for Nextcloud 29, 28, 27 (/var/run/docker.sock)"
@echo " dock-sock27 create docker daemon for Nextcloud 27 (/var/run/docker.sock)"
@echo " dock-sock27-gpu create docker daemon with GPU for Nextcloud 27 (/var/run/docker.sock)"
@echo " dock-sock create docker daemon for Nextcloud 30, 29, 28 (/var/run/docker.sock)"
@echo " dock-sock28 create docker daemon for Nextcloud 28 (/var/run/docker.sock)"
@echo " dock-sock28-gpu create docker daemon with GPU for Nextcloud 28 (/var/run/docker.sock)"
@echo " dock-sock29 create docker daemon for Nextcloud 29 (/var/run/docker.sock)"
@echo " dock-sock29-gpu create docker daemon with GPU for Nextcloud 29 (/var/run/docker.sock)"
@echo " dock-sock create docker daemon for Nextcloud Last (/var/run/docker.sock)"
@echo " dock-sock-gpu create docker daemon with GPU for Nextcloud Last (/var/run/docker.sock)"
@echo " "
@echo " Daemon register(any OS, host:port)"
@echo " dock2port will map docker socket to port. first use this!"
@echo " dock-port27 create docker daemon for Nextcloud 27 (host.docker.internal:8443)"
@echo " dock-port28 create docker daemon for Nextcloud 28 (host.docker.internal:8443)"
@echo " dock-port29 create docker daemon for Nextcloud 29 (host.docker.internal:8443)"
@echo " dock-port create docker daemons for Nextcloud Last (host.docker.internal:8443)"

.PHONY: dock-sock27
dock-sock27:
@echo "creating daemon for nextcloud 'stable27' container"
docker exec master-stable27-1 sudo -u www-data php occ app_api:daemon:register \
docker_dev Docker docker-install http /var/run/docker.sock http://stable27.local/index.php --net=master_default

.PHONY: dock-sock27-gpu
dock-sock27-gpu:
@echo "creating daemon with NVIDIA gpu for nextcloud 'stable27' container"
docker exec master-stable27-1 sudo -u www-data php occ app_api:daemon:register \
docker_dev_gpu "Docker with GPU" docker-install http /var/run/docker.sock http://stable27.local/index.php --net=master_default --gpu --set-default

.PHONY: dock-sock28
dock-sock28:
@echo "creating daemon for nextcloud 'stable28' container"
Expand All @@ -53,6 +41,18 @@ dock-sock28-gpu:
docker exec master-stable28-1 sudo -u www-data php occ app_api:daemon:register \
docker_dev_gpu "Docker with GPU" docker-install http /var/run/docker.sock http://stable28.local/index.php --net=master_default --gpu --set-default

.PHONY: dock-sock29
dock-sock29:
@echo "creating daemon for nextcloud 'stable29' container"
docker exec master-stable29-1 sudo -u www-data php occ app_api:daemon:register \
docker_dev Docker docker-install http /var/run/docker.sock http://stable29.local/index.php --net=master_default

.PHONY: dock-sock29-gpu
dock-sock29-gpu:
@echo "creating daemon with NVIDIA gpu for nextcloud 'stable29' container"
docker exec master-stable29-1 sudo -u www-data php occ app_api:daemon:register \
docker_dev_gpu "Docker with GPU" docker-install http /var/run/docker.sock http://stable29.local/index.php --net=master_default --gpu --set-default

.PHONY: dock-sock
dock-sock:
@echo "creating daemon for nextcloud 'master' container"
Expand All @@ -74,20 +74,20 @@ dock2port:
--net=master_default \
--restart unless-stopped --privileged -d ghcr.io/cloud-py-api/nextcloud-appapi-dsp:latest

.PHONY: dock-port27
dock-port27:
@echo "creating daemon for nextcloud '27' container"
docker exec master-stable27-1 sudo -u www-data php occ app_api:daemon:register \
docker_dev Docker docker-install http nextcloud-appapi-dsp:2375 http://stable27.local/index.php \
--net=master_default --haproxy_password="some_secure_password"

.PHONY: dock-port28
dock-port28:
@echo "creating daemon for nextcloud '27' container"
@echo "creating daemon for nextcloud '28' container"
docker exec master-stable28-1 sudo -u www-data php occ app_api:daemon:register \
docker_dev Docker docker-install http nextcloud-appapi-dsp:2375 http://stable28.local/index.php \
--net=master_default --haproxy_password="some_secure_password"

.PHONY: dock-port29
dock-port29:
@echo "creating daemon for nextcloud '29' container"
docker exec master-stable29-1 sudo -u www-data php occ app_api:daemon:register \
docker_dev Docker docker-install http nextcloud-appapi-dsp:2375 http://stable29.local/index.php \
--net=master_default --haproxy_password="some_secure_password"

.PHONY: dock-port
dock-port:
@echo "creating daemon for nextcloud 'master' container"
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ to join us in shaping a more versatile, stable, and secure app landscape.
<screenshot>https://raw.githubusercontent.com/cloud-py-api/app_api/main/screenshots/app_api_4.png</screenshot>
<dependencies>
<php min-version="8.1"/>
<nextcloud min-version="27" max-version="31"/>
<nextcloud min-version="28" max-version="31"/>
</dependencies>
<background-jobs>
<job>OCA\AppAPI\BackgroundJob\ExAppInitStatusCheckJob</job>
Expand Down
7 changes: 1 addition & 6 deletions lib/Listener/LoadFilesPluginListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@ public function handle(Event $event): void {
'fileActions' => $exFilesActions,
'instanceId' => $this->config->getSystemValue('instanceid'),
]);
$ncVersion = $this->config->getSystemValueString('version', '0.0.0');
if (version_compare($ncVersion, '28.0', '<')) {
Util::addScript(Application::APP_ID, Application::APP_ID . '-filesplugin');
} else {
Util::addScript(Application::APP_ID, Application::APP_ID . '-filesplugin28');
}
Util::addScript(Application::APP_ID, Application::APP_ID . '-filesplugin');
Util::addStyle(Application::APP_ID, 'filesactions');
}
}
Expand Down
Loading
Loading