From e9dc8ee4638189bcdcad1c1053d21cc270ea1358 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sat, 24 Aug 2024 17:45:12 +0200 Subject: [PATCH 1/3] Removed gitpod --- dev/gitpod/docker-compose.yml | 67 ----------------------------------- dev/gitpod/install.sh | 53 --------------------------- 2 files changed, 120 deletions(-) delete mode 100644 dev/gitpod/docker-compose.yml delete mode 100644 dev/gitpod/install.sh diff --git a/dev/gitpod/docker-compose.yml b/dev/gitpod/docker-compose.yml deleted file mode 100644 index 37b531a4485..00000000000 --- a/dev/gitpod/docker-compose.yml +++ /dev/null @@ -1,67 +0,0 @@ -version: "3.7" - -services: - apache: - image: openmage/php-dev:7.3-apache - hostname: ${HOST_NAME:-openmage-7f000001.nip.io} - user: "33333:33333" - ports: - - "${HOST_PORT:-80}:80" - volumes: - - ../..:/var/www/html - environment: - - ENABLE_SENDMAIL=true - - XDEBUG_CONFIG=remote_connect_back=1 remote_enable=1 idekey=phpstorm - - MAGE_IS_DEVELOPER_MODE=1 - links: - - mysql - - cron: - image: openmage/php-dev:7.3-cli - working_dir: /var/www/html - command: /run-cron.sh - user: www-data - volumes: - - ../..:/var/www/html - environment: - - ENABLE_SENDMAIL=true - links: - - mysql - - cli: - image: openmage/php-dev:7.3-apache - working_dir: /var/www/html - command: /bin/true - user: "33333:33333" - volumes: - - ../..:/var/www/html -# environment: -# - AWS_ACCESS_KEY_ID=00000000000000000000 -# - AWS_SECRET_ACCESS_KEY=0000000000000000000000000000000000000000 -# - AWS_REGION=eu-west-1 -# - AWS_BUCKET=magedbm -# - AWS_MEDIA_BUCKET=magemm - links: - - mysql - - "apache:${HOST_NAME:-openmage-7f000001.nip.io}" - - composer: - image: composer:2.4 - volumes: - - ../..:/app - - mysql: - image: mysql:5.7 - ports: - - 3306 - command: --default-authentication-plugin=mysql_native_password - environment: - - MYSQL_ALLOW_EMPTY_PASSWORD=yes - - MYSQL_USER=openmage - - MYSQL_PASSWORD=openmage - - MYSQL_DATABASE=openmage - volumes: - - mysql:/var/lib/mysql - -volumes: - mysql: diff --git a/dev/gitpod/install.sh b/dev/gitpod/install.sh deleted file mode 100644 index a898f463c87..00000000000 --- a/dev/gitpod/install.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -set -e -dir=$(dirname "${BASH_SOURCE[0]}") -cd $dir -test -f .env && source .env - -chmod 777 ../../app/etc ../../media ../../var - -docker-compose up -d mysql apache -sleep 4 -# mostly a copy from the openmage directory -echo "Starting services..." -for i in $(seq 1 20); do - sleep 1 - docker exec gitpod-mysql-1 mysql -e 'show databases;' 2>/dev/null | grep -qF 'openmage' && break -done - -HOST_PORT_PART=":${HOST_PORT:-80}" -test "$HOST_PORT_PART" = ":80" && HOST_PORT_PART="" -BASE_URL=${BASE_URL:-"http://${HOST_NAME:-openmage-7f000001.nip.io}${HOST_PORT_PART}/"} -ADMIN_EMAIL="${ADMIN_EMAIL:-admin@example.com}" -ADMIN_USERNAME="${ADMIN_USERNAME:-admin}" -ADMIN_PASSWORD="${ADMIN_PASSWORD:-veryl0ngpassw0rd}" - -echo "Installing Composer dependencies..." -docker-compose run --rm composer composer install --no-progress --ignore-platform-req=ext-* - -echo "Installing OpenMage LTS..." -docker-compose run --rm cli php install.php \ - --license_agreement_accepted yes \ - --locale en_US \ - --timezone America/New_York \ - --default_currency USD \ - --db_host mysql \ - --db_name openmage \ - --db_user openmage \ - --db_pass openmage \ - --url "$BASE_URL" \ - --use_rewrites yes \ - --use_secure no \ - --secure_base_url "$BASE_URL" \ - --use_secure_admin no \ - --skip_url_validation \ - --admin_firstname OpenMage \ - --admin_lastname User \ - --admin_email "$ADMIN_EMAIL" \ - --admin_username "$ADMIN_USERNAME" \ - --admin_password "$ADMIN_PASSWORD" - -echo "" -echo "Setup is complete!" -echo "Visit ${BASE_URL}/admin and login with '$ADMIN_USERNAME' : '$ADMIN_PASSWORD'" -echo "MySQL server IP: $(docker exec gitpod-apache-1 getent hosts mysql | awk '{print $1}')" From cdaf0b942766604d2315c6176a173b46fa7e1344 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sat, 24 Aug 2024 23:35:12 +0200 Subject: [PATCH 2/3] Removed .gitpod.yml --- .gitpod.yml | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 .gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml deleted file mode 100644 index 6cd0417492e..00000000000 --- a/.gitpod.yml +++ /dev/null @@ -1,22 +0,0 @@ -# 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' - - name: Install OpenMage - init: | - BASE_URL="$(echo "$GITPOD_WORKSPACE_URL" | sed s~https://~https://8000-~)" - HOST_PORT=8000 BASE_URL=$BASE_URL bash dev/gitpod/install.sh - command: docker ps - openMode: tab-after - - name: prepare git - init: git config core.fileMode false - -vscode: - extensions: - - bmewburn.vscode-intelephense-client - -# List the ports to expose. Learn more https://www.gitpod.io/docs/config-ports/ -ports: - - port: 8000 - visibility: public - onOpen: open-preview From 0abef6259a3b5d34b7d2f5659d198c21154c143d Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sat, 24 Aug 2024 23:43:17 +0200 Subject: [PATCH 3/3] Updated .gitignore --- .gitignore | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitignore b/.gitignore index 442b0be24ae..e7ae443ef38 100644 --- a/.gitignore +++ b/.gitignore @@ -30,11 +30,6 @@ /dev/tests/crap4j.xml /dev/tests/junit.xml -# Add Gitpod online IDE config -# https://github.com/OpenMage/magento-lts/pull/1836 -/dev/gitpod/docker-magento -/dev/gitpod/.env - # Add development environment setup files and README # https://github.com/OpenMage/magento-lts/pull/1012 /dev/openmage/docker-magento