Skip to content

Commit 1ad3460

Browse files
elidrissidevfballiano
authored andcommitted
Gitpod: added installation of composer dependencies (#2989)
1 parent ca87653 commit 1ad3460

File tree

4 files changed

+19
-3
lines changed

4 files changed

+19
-3
lines changed

dev/gitpod/docker-compose.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ services:
4545
- mysql
4646
- "apache:${HOST_NAME:-openmage-7f000001.nip.io}"
4747

48+
composer:
49+
image: composer:2.4
50+
volumes:
51+
- ../..:/app
52+
4853
mysql:
4954
image: mysql:5.7
5055
ports:

dev/gitpod/install.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ sleep 4
1212
echo "Starting services..."
1313
for i in $(seq 1 20); do
1414
sleep 1
15-
docker exec openmage_mysql_1 mysql -e 'show databases;' 2>/dev/null | grep -qF 'openmage' && break
15+
docker exec gitpod-mysql-1 mysql -e 'show databases;' 2>/dev/null | grep -qF 'openmage' && break
1616
done
1717

1818
HOST_PORT_PART=":${HOST_PORT:-80}"
@@ -22,6 +22,9 @@ ADMIN_EMAIL="${ADMIN_EMAIL:-admin@example.com}"
2222
ADMIN_USERNAME="${ADMIN_USERNAME:-admin}"
2323
ADMIN_PASSWORD="${ADMIN_PASSWORD:-veryl0ngpassw0rd}"
2424

25+
echo "Installing Composer dependencies..."
26+
docker-compose run --rm composer composer install --no-progress --ignore-platform-req=ext-*
27+
2528
echo "Installing OpenMage LTS..."
2629
docker-compose run --rm cli php install.php \
2730
--license_agreement_accepted yes \
@@ -46,5 +49,5 @@ docker-compose run --rm cli php install.php \
4649

4750
echo ""
4851
echo "Setup is complete!"
49-
echo "Visit ${BASE_URL}admin and login with '$ADMIN_USERNAME' : '$ADMIN_PASSWORD'"
50-
echo "MySQL server IP: $(docker exec openmage_apache_1 getent hosts mysql | awk '{print $1}')"
52+
echo "Visit ${BASE_URL}/admin and login with '$ADMIN_USERNAME' : '$ADMIN_PASSWORD'"
53+
echo "MySQL server IP: $(docker exec gitpod-apache-1 getent hosts mysql | awk '{print $1}')"

dev/openmage/docker-compose.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ services:
4343
- mysql
4444
- "apache:${HOST_NAME:-openmage-7f000001.nip.io}"
4545

46+
composer:
47+
image: composer:2.4
48+
volumes:
49+
- ../..:/app
50+
4651
mysql:
4752
image: mysql:5.7
4853
ports:

dev/openmage/install.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ for i in $(seq 1 20); do
4747
$dc exec mysql mysql -e 'show databases;' 2>/dev/null | grep -qF 'openmage' && break
4848
done
4949

50+
echo "Installing Composer dependencies..."
51+
$dc run --rm composer composer install --no-progress --ignore-platform-req=ext-*
52+
5053
echo "Installing OpenMage LTS..."
5154
$dc run --rm cli php install.php \
5255
--license_agreement_accepted yes \

0 commit comments

Comments
 (0)