Update Docker build workflow

Author: b3b

.dockerignore

@@ -1,10 +1,12 @@
 build
 dist
+pythonhere.egg-info
 *.egg-info
 *.egg/
 *.pyc
 *.swp
 
+.gitignore
 .tox
 .coverage
 html/*
@@ -13,3 +15,7 @@ __pycache__
 **/.git
 **/.buildozer
 **/.*
+**/.venv
+
+midistream
+herethere

.github/workflows/push-docker.yml

@@ -1,48 +1,43 @@
 on:
   push:
     tags:
-      - '*'
+      - "[0-9]*.[0-9]*.[0-9]*"
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
-      - uses: "actions/checkout@v2"
+      - uses: "actions/checkout@v6"
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Get the version
-        id: version
-        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
+        uses: docker/setup-buildx-action@v3
 
       - name: Update version from tag
-        env:
-          VERSION: ${{ steps.version.outputs.VERSION }}
         run: |
+          VERSION="${GITHUB_REF_NAME}"
           echo "Version is: ${VERSION}"
-          test -n "${VERSION}"
+          [[ "${VERSION}" =~ ^[0-9]+[.][0-9]+[.][0-9]+$ ]]
           echo "__version__ = \"${VERSION}\"" > pythonhere/version_here.py
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile
           push: true
           tags: |
-            "herethere/pythonhere:latest"
-            "herethere/pythonhere:${{ steps.version.outputs.VERSION }}"
+            herethere/pythonhere:latest
+            herethere/pythonhere:${{ github.ref_name }}
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

Dockerfile

@@ -1,15 +1,15 @@
-FROM jupyter/base-notebook:python-3.8.6
+FROM quay.io/jupyter/base-notebook:python-3.13
 
-COPY . /src
-COPY examples /home/${NB_USER}/examples
+COPY --chown=${NB_USER}:users . /home/${NB_USER}/src
+COPY --chown=${NB_USER}:users examples /home/${NB_USER}/examples
 
-RUN cd /src && pip install .[dev,docker]
+RUN cd /home/${NB_USER}/src && \
+    python -m pip install --upgrade pip && \
+    python -m pip install . --group docker && \
+    python -m pip check
 
-USER root
 RUN cd /home/${NB_USER}/examples && \
     jupytext --to ipynb *.md && \
     rm *.md && \
-    chown -R ${NB_USER} \
-    /usr/local/bin/fix-permissions /home/${NB_USER}/examples &&\
     rm -rf /home/${NB_USER}/.cache && \
-    rm -rf /src
+    rm -rf /home/${NB_USER}/src

README.rst

@@ -55,6 +55,9 @@ Example command to start the Docker container::
     docker run \
            --rm \
            -p 8888:8888 \
+           --user root \
+           -e CHOWN_EXTRA=/home/jovyan/work \
+           -e CHOWN_EXTRA_OPTS='-R' \
            -v "$(pwd)/work":/home/jovyan/work \
            herethere/pythonhere:latest
 

docker-compose.yml.tmpl

@@ -7,8 +7,11 @@ services:
     # build: .
     ports:
       - 8888:8888
+    user: root      
+    environment:
+      - CHOWN_EXTRA=/home/jovyan/work
+      - CHOWN_EXTRA_OPTS=-R
     # Uncomment and fill in environment, to override values from there.env config
-    # environment:
     #   - THERE_HOST=
     #   - THERE_PORT=8022
     #   - THERE_USER=

pyproject.toml

@@ -22,7 +22,7 @@ classifiers = [
     "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-    "herethere>=0.1.0",
+    "herethere[magic]>=0.1.0",
     "ipython",
     "ipywidgets",
     "Pillow",
@@ -47,7 +47,7 @@ dev = [
     "twine",
 ]
 docker = [
-    "jupytext==1.7.1",
+    "jupytext==1.19.3",
 ]
 
 [project.urls]