simplified version stamping (#1583)

sillsdev · Nov 8, 2022 · 652076c · 652076c
1 parent 3926eef
commit 652076c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/integrate-and-deploy.yml b/.github/workflows/integrate-and-deploy.yml
@@ -62,9 +62,12 @@ jobs:
         run: npm ci
       -
         name: Build legacy app
+        run: docker compose build --build-arg ENVIRONMENT=production --build-arg BUILD_VERSION=${{ steps.image.outputs.TAG_APP }} app
+      -
+        name: Verify version stamping
         run: |
-          docker compose build --build-arg ENVIRONMENT=production --build-arg BUILD_VERSION=${{ steps.image.outputs.TAG_APP }} app
-          docker compose run --rm app cat /var/www/html/build-version.txt /var/www/html/version.php
+          docker compose run --rm app cat build-version.txt version.php
+          docker compose run --rm app cat version.php | grep ${{ steps.image.outputs.TAG_APP }}
       -
         name: Build "next" images
         run: make build-next

diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
@@ -82,8 +82,8 @@ COPY --from=composer-builder /composer/vendor /var/www/html/vendor
 COPY docker/app/symfony-exceptions.patch /
 RUN patch -p4 -i /symfony-exceptions.patch
 
-RUN echo "${BUILD_VERSION}" > /var/www/html/build-version.txt \
-    && sed -i /var/www/html/version.php -e "s/^\\(define('VERSION', '\\).*;\$/\\1${BUILD_VERSION}'\\);/"
+RUN echo "${BUILD_VERSION}" > build-version.txt \
+    && sed -i "s/9.9.9/${BUILD_VERSION}/" version.php
 
 ENTRYPOINT [ "tini", "-g", "--" ]
 CMD [ "apache2-foreground" ]