Add Docker image build to CD pipeline with ghcr.io and Docker Hub support

Author: JulianOpper

.github/workflows/python-publish.yml

@@ -11,21 +11,22 @@ name: CD
 on:
   release:
     types: [published]
-    
+
   workflow_dispatch:
 
 permissions:
   contents: read
+  packages: write
 
 jobs:
   deploy:
-
+    name: Publish to PyPI
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     - name: Install dependencies
@@ -39,3 +40,71 @@ jobs:
       with:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}
+
+  docker:
+    name: Build & Push Docker Image
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+
+      - name: Extract metadata for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository }}
+          tags: |
+            type=semver,pattern={{version}}
+            type=raw,value=latest
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: docker/Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+  # TODO: To enable Docker Hub publishing, add DOCKERHUB_USERNAME and DOCKERHUB_TOKEN
+  #       as repository secrets.
+  docker-hub:
+    name: Push to Docker Hub
+    runs-on: ubuntu-latest
+    if: ${{ secrets.DOCKERHUB_USERNAME != '' }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Extract metadata for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ secrets.DOCKERHUB_USERNAME }}/ftio
+          tags: |
+            type=semver,pattern={{version}}
+            type=raw,value=latest
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: docker/Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

Makefile

@@ -77,15 +77,15 @@ clean: clean_project
 
 
 docker:
-	cd docker && docker build -t freq_io:1.0 .
+	docker build -f docker/Dockerfile -t freq_io:1.0 .
 
 
 docker_run:
-	cd docker && docker run -v "$$PWD/examples/tmio/JSONL/8.jsonl:/freq_io/8.jsonl" -t freq_io:1.0 ftio 8.jsonl -e no 
+	docker run -v "$$PWD/examples/tmio/JSONL/8.jsonl:/freq_io/8.jsonl" -t freq_io:1.0 8.jsonl -e no
 
 
 docker_interactive:
-	cd docker && docker run -ti   freq_io:1.0
+	docker run -ti --entrypoint /bin/bash freq_io:1.0
 
 
 

docker/Dockerfile

@@ -1,16 +1,10 @@
-FROM python:latest
+FROM python:3.11-slim
 
-COPY ../ftio /freq_io/ftio
-# COPY ioparse /freq_io/ioparse
-# COPY install /freq_io/install
-# COPY prediction /freq_io/prediction
-# COPY predictor.py /freq_io/
-# COPY ftio.py /freq_io/
+COPY pyproject.toml README.md LICENSE /freq_io/
+COPY ftio /freq_io/ftio
 
 WORKDIR /freq_io
 
-# RUN  python3 -m venv ./venv
-RUN ls
-RUN  python3 -m pip install .  
-    
-CMD ["ftio.py", "-e", "no"]
+RUN python3 -m pip install --no-cache-dir .
+
+ENTRYPOINT ["ftio"]