From bdcfba4a932616904895173c77eb72cd49f6e700 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 19 Sep 2024 05:11:27 +0200 Subject: [PATCH] Preview PR in gitpod (#4175) * Updated gitpod * Updated gitpod --- .gitpod.yml | 19 ++++++++++++++++++- dev/gitpod/docker-compose.yml | 6 +++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 6cd0417492e..df0a5451b50 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,21 @@ -# List the start up tasks. Learn more https://www.gitpod.io/docs/config-start-tasks/ +github: + prebuilds: + # enable for the master/default branch (defaults to true) + master: true + # enable for all branches in this repo (defaults to false) + branches: true + # enable for pull requests coming from this repo (defaults to true) + pullRequests: true + # enable for pull requests coming from forks (defaults to false) + pullRequestsFromForks: true + # add a "Review in Gitpod" button as a comment to pull requests (defaults to true) + addComment: false + # add a "Review in Gitpod" button to pull requests (defaults to false) + addBadge: true + # add a label once the prebuild is ready to pull requests (defaults to false) + addLabel: false + +# List the start-up tasks. Learn more https://www.gitpod.io/docs/config-start-tasks/ tasks: - init: echo 'init script' # runs during prebuild command: echo 'start script' diff --git a/dev/gitpod/docker-compose.yml b/dev/gitpod/docker-compose.yml index 37b531a4485..d8f7bfbc456 100644 --- a/dev/gitpod/docker-compose.yml +++ b/dev/gitpod/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: apache: - image: openmage/php-dev:7.3-apache + image: openmage/php-dev:8.3-apache hostname: ${HOST_NAME:-openmage-7f000001.nip.io} user: "33333:33333" ports: @@ -17,7 +17,7 @@ services: - mysql cron: - image: openmage/php-dev:7.3-cli + image: openmage/php-dev:8.3-cli working_dir: /var/www/html command: /run-cron.sh user: www-data @@ -29,7 +29,7 @@ services: - mysql cli: - image: openmage/php-dev:7.3-apache + image: openmage/php-dev:8.3-apache working_dir: /var/www/html command: /bin/true user: "33333:33333"