fix: make phar in docker

SMillerDev · Mar 18, 2024 · e65da55 · e65da55
1 parent 39d0ac2
commit e65da55
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 14 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -28,33 +28,37 @@ 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
+          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
+          target: phpdraft
+          no-cache-filters: phpdraft
+          build-args: |
+            BUILDKIT_CONTEXT_KEEP_GIT_DIR=true
+            PHPDRAFT_RELEASE_ID=2.0.0
diff --git a/Dockerfile b/Dockerfile
@@ -24,13 +24,19 @@ RUN composer install --ignore-platform-req=ext-uopz
 
 FROM php:8.3-cli-bullseye AS phpdraft-build
 
+ARG PHPDRAFT_RELEASE_ID=1.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 echo "phar.readonly=0" >> /usr/local/etc/php/php.ini-production
+RUN php -i
+
+RUN php ./vendor/bin/phing phar-nightly
+
+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

diff --git a/build.xml b/build.xml
@@ -130,6 +130,12 @@
         <echo message="Building version: ${version}, type: ${type}, output: ${_version}"/>
         <fail unless="_version" message="Could not construct version parameter!" />
 
+        <php function="ini_get" returnProperty="_pharReadonly">
+            <param value="phar.readonly"/>
+        </php>
+
+        <fail if="_pharReadonly" message="No PHAR creation allowed"/>
+
         <exec executable="${project.basedir}/vendor/bin/phpab" taskname="phpab">
             <arg value="--all"/>
             <arg value="--static"/>

diff --git a/src/PHPDraft/Out/Version.php b/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');
     }
 
     /**