From 0203303ed97f89f48845bc06b10d11dfa414fdd7 Mon Sep 17 00:00:00 2001
From: Sean Molenaar <sean@seanmolenaar.eu>
Date: Fri, 15 Mar 2024 13:19:17 +0100
Subject: [PATCH] fix: make phar in docker

---
 .github/workflows/docker.yml | 22 ++++++++++++----------
 Dockerfile                   | 11 ++++++++---
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 216b417..fffc576 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -28,19 +28,13 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Extract metadata (tags, labels) for Docker
+      - name: Extract metadata (tags, labels) for Drafter
         id: meta-drafter
         uses: docker/metadata-action@master
         with:
           images: ${{ env.REGISTRY }}/${{ github.repository }}/drafter
 
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@master
-        with:
-          images: ${{ env.REGISTRY }}/${{ github.repository }}
-
-      - name: Build and push Docker image
+      - name: Build and push drafter Docker image
         uses: docker/build-push-action@master
         with:
           context: .
@@ -48,13 +42,21 @@ jobs:
           tags: ${{ steps.meta-drafter.outputs.tags }}
           labels: ${{ steps.meta-drafter.outputs.labels }}
           target: drafter-build
+          no-cache-filters: drafter-build
           cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ github.repository }}/drafter:latest
 
-      - name: Build and push Docker image
+      - name: Extract metadata (tags, labels) for PHPDraft
+        id: meta
+        uses: docker/metadata-action@master
+        with:
+          images: ${{ env.REGISTRY }}/${{ github.repository }}
+
+      - name: Build and push PHPDraft Docker image
         uses: docker/build-push-action@master
         with:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          target: phpdraft
\ No newline at end of file
+          target: phpdraft
+          no-cache-filters: phpdraft
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 1171533..74cda99 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,13 +24,18 @@ RUN composer install --ignore-platform-req=ext-uopz
 
 FROM php:8.3-cli-bullseye AS phpdraft-build
 
-
+RUN apt-get install --yes git
 
 COPY --from=composer /usr/src/phpdraft /usr/src/phpdraft
 WORKDIR /usr/src/phpdraft
 
-RUN ./vendor/bin/phing phar-nightly
-COPY /usr/src/phpdraft/build/out/phpdraft-nightly.phar /usr/local/bin/phpdraft
+RUN git describe --tags
+
+RUN php -d phar.readonly=0 ./vendor/bin/phing phar-nightly
+
+RUN ls -al .
+
+COPY /usr/src/phpdraft/build/out/phpdraft-*.phar /usr/local/bin/phpdraft
 RUN chmod +x /usr/local/bin/phpdraft
 
 FROM php:8.3-cli-bullseye AS phpdraft