Merge pull request #835 from nextcloud/tests/cypress-19

juliusknorr · web-flow · commit dbd89e73fef4 · 2020-05-19T22:23:34.000+02:00
diff --git a/cypress/Dockerfile b/cypress/Dockerfile
@@ -1,4 +1,4 @@
-FROM nextcloudci/server:server-16
+FROM nextcloudci/server:server-17
 
 RUN mkdir /var/www/html/data
 RUN chown -R www-data:www-data /var/www/html/data
diff --git a/cypress/docker-compose.yml b/cypress/docker-compose.yml
@@ -10,5 +10,6 @@ services:
         environment:
             CYPRESS_baseUrl:
             APP_SOURCE:
+            BRANCH: stable19
         volumes:
             - ${APP_SOURCE}:/var/www/html/apps/text

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM nextcloudci/server:server-16`
	`1`	`+FROM nextcloudci/server:server-17`
`2`	`2`
`3`	`3`	`RUN mkdir /var/www/html/data`
`4`	`4`	`RUN chown -R www-data:www-data /var/www/html/data`