keep libcairo2-dev; update versioning

Author: oscarlevin

.github/workflows/docker-publish.yml

@@ -35,11 +35,11 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Get latest pretext version from PyPI
+      - name: Read version from verstion.txt
         run: |
-            PTX_VERSION=$(curl -s https://pypi.org/pypi/pretext/json | grep -oP '"version":\s*"\K[^"]+')
-            echo "Latest pretext version: $PTX_VERSION"
-            echo "PTX_VERSION=$PTX_VERSION" >> $GITHUB_ENV
+            VERSION=$(cat version.txt | tr -d '\n')
+            echo "Container version to deploy: $VERSION"
+            echo "VERSION=$VERSION" >> $GITHUB_ENV
 
       - name: Build and push base
         if: ${{ github.event.inputs.container == 'all' || github.event.inputs.container == 'base' || github.event.inputs.container == '' }}
@@ -49,15 +49,15 @@ jobs:
           context: .
           file: ./base/Dockerfile
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/pretext:${{ env.PTX_VERSION }},${{ secrets.DOCKERHUB_USERNAME }}/pretext:latest
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/pretext:${{ env.VERSION }},${{ secrets.DOCKERHUB_USERNAME }}/pretext:latest
 
       - name: Build and push full
         if: ${{ github.event.inputs.container == 'all' || github.event.inputs.container == 'full' || github.event.inputs.container == '' }}
         uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64,linux/arm64
           context: .
-          build-args: BASE_IMAGE_TAG=${{ env.PTX_VERSION }}
+          build-args: BASE_IMAGE_TAG=${{ env.VERSION }}
           file: ./full/Dockerfile
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/pretext-full:${{ env.PTX_VERSION }},${{ secrets.DOCKERHUB_USERNAME }}/pretext-full:latest
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/pretext-full:${{ env.VERSION }},${{ secrets.DOCKERHUB_USERNAME }}/pretext-full:latest

base/Dockerfile

@@ -37,7 +37,6 @@ RUN apt-get update \
 && npm install @mermaid-js/mermaid-cli -g \
 && apt-get remove -y \
                     python3-dev \
-                    libcairo2-dev \
                     gcc \
                     build-essential \
 && apt-get autoremove -y \

lite/Dockerfile

@@ -37,7 +37,6 @@ RUN apt-get update \
 && npm install @mermaid-js/mermaid-cli -g \
 && apt-get remove -y \
                     python3-dev \
-                    libcairo2-dev \
                     gcc \
                     build-essential \
 && apt-get autoremove -y \

version.txt

@@ -0,0 +1 @@
+1.0