Fix AMQP related errors while building the environment (CodelyTV#253)

JavierCane · web-flow · commit e8adcc927d8d · 2021-05-10T17:35:57.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,27 +16,28 @@ jobs:
 
       - run: docker-compose pull
 
-      - uses: satackey/action-docker-layer-caching@v0.0.11
-        continue-on-error: true
-        with:
-          key: php_ddd_example-cache-${{ secrets.CACHE_VERSION }}-{hash}
-          restore-keys: |
-            php_ddd_example-cache-${{ secrets.CACHE_VERSION }}-
-      - name: Install dependencies
+      - name: 🎻 Install dependencies
         run: make composer-install
 
-      - name: Start all the environment
+      - name: 🐳 Start all the environment
         run: make start
 
-      - name: Wait for the environment to get up
+      - name: 🏁 Static analysis
+        run: make static-analysis
+
+      - name: 🦭 Wait for the database to get up
         run: |
           while ! make ping-mysql &>/dev/null; do
               echo "Waiting for database connection..."
               sleep 2
           done
 
-      - name: Run the tests
-        run: make test
+      - name: 🐰 Wait for the message broker to get up
+        run: |
+          while ! make ping-rabbitmq &>/dev/null; do
+              echo "Waiting for RabbitMQ connection..."
+              sleep 2
+          done
 
-      - name: Static analysis
-        run: make static-analysis
+      - name: ✅ Run the tests
+        run: make test
diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,7 @@ RUN apk --update upgrade \
         zip \
         pdo_mysql
 
-RUN pickle install apcu-5.1.20
+RUN pickle install apcu@5.1.20
 
 ADD etc/infrastructure/php/extensions/rabbitmq.sh /root/install-rabbitmq.sh
 ADD etc/infrastructure/php/extensions/xdebug.sh /root/install-xdebug.sh
diff --git a/Makefile b/Makefile
@@ -81,6 +81,10 @@ rebuild: composer-env-file
 ping-mysql:
 	@docker exec codelytv-php_ddd_skeleton-mooc-mysql mysqladmin --user=root --password= --host "127.0.0.1" ping --silent
 
+.PHONY: ping-rabbitmq
+ping-rabbitmq:
+	@docker exec codelytv-php_ddd_skeleton-rabbitmq rabbitmqctl ping --silent
+
 clean-cache:
 	@rm -rf apps/*/*/var
 	@docker exec codelytv-php_ddd_skeleton-backoffice_backend-php ./apps/backoffice/backend/bin/console cache:warmup
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
 
   mooc_mysql:
     container_name: codelytv-php_ddd_skeleton-mooc-mysql
-    image: mysql:8.0
+    image: mariadb:10.6
     ports:
       - 3360:3306
     environment:
diff --git a/etc/infrastructure/php/extensions/rabbitmq.sh b/etc/infrastructure/php/extensions/rabbitmq.sh
@@ -1,4 +1,4 @@
-git clone https://github.com/php-amqp/php-amqp.git
+git clone --depth 1 --branch v1.11.0beta https://github.com/php-amqp/php-amqp.git
 cd php-amqp
 phpize
 ./configure
diff --git a/etc/infrastructure/php/extensions/xdebug.sh b/etc/infrastructure/php/extensions/xdebug.sh
@@ -1,4 +1,4 @@
-git clone -n https://github.com/xdebug/xdebug.git
+git clone --depth 1 --branch 3.0.4 https://github.com/xdebug/xdebug.git
 cd xdebug
 git checkout 592ab9fa10cfa132623489511e92ef69fb91744c
 phpize

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-git clone https://github.com/php-amqp/php-amqp.git`
	`1`	`+git clone --depth 1 --branch v1.11.0beta https://github.com/php-amqp/php-amqp.git`
`2`	`2`	`cd php-amqp`
`3`	`3`	`phpize`
`4`	`4`	`./configure`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-git clone -n https://github.com/xdebug/xdebug.git`
	`1`	`+git clone --depth 1 --branch 3.0.4 https://github.com/xdebug/xdebug.git`
`2`	`2`	`cd xdebug`
`3`	`3`	`git checkout 592ab9fa10cfa132623489511e92ef69fb91744c`
`4`	`4`	`phpize`