Revert multi-layering for speed; push to GHCR as well.

.github/workflows/default.yml

@@ -75,13 +75,12 @@ jobs :
         run : |
           cp sample.env .env
           cp azuracast.sample.env azuracast.env
-
           cp docker-compose.sample.yml docker-compose.yml
           docker-compose pull web
 
           cp docker-compose.testing.yml docker-compose.override.yml
-
           docker-compose build web
+
           docker-compose run --rm --user="azuracast" web azuracast_install
 
       - name : Run functional test suite.
@@ -136,6 +135,13 @@ jobs :
           username : ${{ secrets.DOCKERHUB_USERNAME }}
           password : ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name : Login to GitHub Container Registry
+        uses : docker/login-action@v1
+        with :
+          registry : ghcr.io
+          username : ${{ github.repository_owner }}
+          password : ${{ secrets.GITHUB_TOKEN }}
+
       - name : Determine Tag Name
         id : tag
         run : |
@@ -152,5 +158,7 @@ jobs :
           context : .
           platforms : linux/amd64,linux/arm64
           cache-from : type=registry,ref=azuracast/azuracast_web_v2:${{ steps.tag.outputs.TAG }}
-          tags : azuracast/azuracast_web_v2:${{ steps.tag.outputs.TAG }}
           push : true
+          tags : |
+            azuracast/azuracast_web_v2:${{ steps.tag.outputs.TAG }}
+            ghcr.io/azuracast/web_v2:${{ steps.tag.outputs.TAG }}

Dockerfile

@@ -61,15 +61,3 @@ ENV LANG="en_US.UTF-8" \
 # Entrypoint and default command
 ENTRYPOINT ["/usr/local/bin/uptime_wait"]
 CMD ["/usr/local/bin/my_init"]
-
-# Test image
-FROM base AS testing
-
-RUN apt-get update \
-    && apt-get install -q -y php7.4-xdebug
-
-ENV PATH="${PATH}:/var/azuracast/.composer/vendor/bin" \
-    APPLICATION_ENV="testing"
-
-# Production image
-FROM base AS prod

docker-compose.testing.yml

@@ -1,13 +1,13 @@
-version: '2.2'
+version : '2.2'
 
 services :
   web :
-    build :
-      context : .
-      target : testing
-      cache_from :
-        - azuracast/azuracast_web_v2:latest
+    image : azuracast_cli:latest
     environment :
       APPLICATION_ENV : 'testing'
+    build :
+      context : ./util/docker/testing
+      cache_from :
+        - azuracast/azuracast_web_v2:latest
     volumes :
       - .:/var/azuracast/www

util/docker/testing/Dockerfile

@@ -0,0 +1,9 @@
+FROM azuracast/azuracast_web_v2:latest
+
+RUN apt-get update \
+    && apt-get install -q -y php7.4-xdebug
+
+ENV PATH="${PATH}:/var/azuracast/.composer/vendor/bin" \
+    APPLICATION_ENV="testing"
+
+USER root