diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbaf00ace8388fc2562ffde1feaa81bfdaddfd29..6119917f226a5a16fd4103165beb5861724de6a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,5 @@
variables:
- CONTAINER_IMAGE: ubuntu
- CONTAINER_TAG: focal
- CONTAINER_NAME: nextcloud
- APP_NAME: $CI_PROJECT_NAME
- APP_ENABLE_ARGS: ''
- TO_PACKAGE: 'appinfo l10n lib templates js img'
+ TO_PACKAGE: 'appinfo l10n lib templates js img'
include:
- project: "e/infra/ecloud/nextcloud-apps/ci-templates"
ref: main
@@ -12,43 +7,3 @@ include:
- project: "e/infra/ecloud/nextcloud-apps/ci-templates"
ref: main
file: "nc-apps-deploy.yml"
-
-.deploy:nextcloud-app:
- stage: deploy
- # assuming all deployment will happen with sames image
- image: $CONTAINER_IMAGE:$CONTAINER_TAG
- # assuming we will need to add SSH for all deployment
- before_script:
- - echo "FAIL" > .job_status
- - mkdir $HOME/.ssh
- - chmod 700 ~/.ssh
- - echo "$SSH_PRIVATE_KEY_ED" > $HOME/.ssh/id_ed25519
- - echo "$SSH_PUBKEY_ED" > $HOME/.ssh/id_ed25519.pub
- - echo "$SSH_KNOWN_HOSTS" > $HOME/.ssh/known_hosts
- - chmod 600 ~/.ssh/id_ed25519
- - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub
- - apt-get update && apt-get install -y openssh-client rsync
- script:
- - echo "Deploying ${APP_NAME} to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)"
- - rsync -avzh dist/ $SSH_USER@$DEPLOYMENT_HOST:/tmp/${CI_JOB_ID}
- - ssh $SSH_USER@$DEPLOYMENT_HOST "sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:disable ${APP_NAME} &&
- sudo rsync -avzh --chown www-data:www-data --delete /tmp/${CI_JOB_ID}/${APP_NAME} ${DEPLOYMENT_PATH}/html/custom_apps/ &&
- sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:enable ${APP_ENABLE_ARGS} ${APP_NAME}"
- - echo "SUCCESS" > .job_status
- after_script:
- # reading job status, checking it and implementing additional steps
- # are not handled here as rm -rf /tmp/${CI_JOB_ID} will always execute
- - ssh $SSH_USER@$DEPLOYMENT_HOST "rm -rf /tmp/${CI_JOB_ID}"
-
-deploy:staging:
- extends: .deploy:nextcloud-app
- when: manual
- only:
- - main
- - murena-main
- - production
- - dev/migrate-webmail-contacts
- - tags
- environment:
- name: staging/01
- url: https://eeo.one
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 97353b22a08dc7b171edbca9f6c96ee7412195ea..d72581ef79e5d69bd3e19b88accac89fb6cc0619 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -10,7 +10,7 @@
- 3.3.3
+ 3.4.0
agpl
Murena SAS
EcloudAccounts