fix: make phar in docker (#568)

Author: SMillerDev

.github/workflows/docker.yml

@@ -20,6 +20,9 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          fetch-tags: true
+          fetch-depth: 0
 
       - name: Log in to the Container registry
         uses: docker/login-action@master
@@ -28,33 +31,42 @@ 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: .
           push: true
           tags: ${{ steps.meta-drafter.outputs.tags }}
           labels: ${{ steps.meta-drafter.outputs.labels }}
-          target: drafter-build
+          target: drafter
+          no-cache-filters: drafter-build,drafter
           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: Last tag
+        id: tag-info
+        run: |
+          echo "latest=$(git describe --tags --always --abbrev=0)" >> "$GITHUB_OUTPUT"
+
+      - 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
+          target: phpdraft
+          no-cache-filters: composer,phpdraft-build,phpdraft
+          build-args: |
+            BUILDKIT_CONTEXT_KEEP_GIT_DIR=true
+            PHPDRAFT_RELEASE_ID=${{ steps.tag-info.outputs.latest }}

Dockerfile

@@ -14,6 +14,9 @@ RUN cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
 RUN cmake --build build
 RUN cmake --install build
 
+FROM debian:bullseye-slim AS drafter
+COPY --from=drafter-build /usr/local/bin/drafter /usr/local/bin/drafter
+
 CMD drafter
 
 FROM composer:latest AS composer
@@ -24,22 +27,23 @@ RUN composer install --ignore-platform-req=ext-uopz
 
 FROM php:8.3-cli-bullseye AS phpdraft-build
 
+ARG PHPDRAFT_RELEASE_ID=0.0.0
 
+RUN echo $PHPDRAFT_RELEASE_ID
 
 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 chmod +x /usr/local/bin/phpdraft
+RUN echo "phar.readonly=0" >> /usr/local/etc/php/conf.d/phar.ini
+
+RUN php ./vendor/bin/phing phar-nightly
+RUN cp /usr/src/phpdraft/build/out/phpdraft-nightly.phar /usr/local/bin/phpdraft
 
 FROM php:8.3-cli-bullseye AS phpdraft
 
 LABEL maintainer="Sean Molenaar sean@seanmolenaar.eu"
 
-COPY --from=phpdraft-build /usr/local/bin/phpdraft /usr/local/bin/phpdraft
 COPY --from=drafter-build /usr/local/bin/drafter /usr/local/bin/drafter
-
-RUN ls -al /usr/local/bin/phpdraft
+COPY --from=phpdraft-build /usr/local/bin/phpdraft /usr/local/bin/phpdraft
 
 CMD phpdraft

build.xml

@@ -130,6 +130,22 @@
         <echo message="Building version: ${version}, type: ${type}, output: ${_version}"/>
         <fail unless="_version" message="Could not construct version parameter!" />
 
+        <exec executable="php" outputProperty="_pharReadonly">
+            <arg value="-r"/>
+            <arg value="echo ini_get('phar.readonly');"/>
+        </exec>
+
+        <echo message="Phar: ${_pharReadonly}"/>
+        <fail message="No PHAR creation allowed">
+            <condition>
+                <or>
+                    <equals arg1="${_pharReadonly}" arg2="1"/>
+                    <equals arg1="${_pharReadonly}" arg2="true"/>
+                    <equals arg1="${_pharReadonly}" arg2="On"/>
+                </or>
+            </condition>
+        </fail>
+
         <exec executable="${project.basedir}/vendor/bin/phpab" taskname="phpab">
             <arg value="--all"/>
             <arg value="--static"/>

src/PHPDraft/Out/Version.php

@@ -35,7 +35,12 @@ public static function version(): void
      */
     public static function release_id(): string
     {
-        return (VERSION === '0') ? @exec('git describe --tags 2>&1') : VERSION;
+        $env_id = getenv('PHPDRAFT_RELEASE_ID');
+        if ($env_id !== FALSE) {
+            return $env_id;
+        }
+
+        return VERSION !== '0' ? VERSION : @exec('git describe --tags 2>&1');
     }
 
     /**