Merge branch 'main' into dev

Author: stfnkth

.github/workflows/docker-image-shiny-meets-fastapi.yml

@@ -0,0 +1,34 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+env:
+  IMAGE_NAME: shiny-meets-fastapi
+  VERSION: latest
+  CONTEXT: routes_example_app
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build the Docker image
+        run: |
+          cd $CONTEXT
+          docker build . --file Dockerfile --tag $IMAGE_NAME:$VERSION
+
+      - name: Log in to registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u token --password-stdin
+
+      - name: Push image to ghcr.io
+        run: |
+          image_id=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
+          # repository name must be lowercase
+          image_id=$(echo $image_id | tr '[A-Z]' '[a-z]')
+          docker tag $IMAGE_NAME:$VERSION $image_id:$VERSION
+          docker push $image_id:$VERSION

.github/workflows/docker-image-shinylive-nginx.yml

@@ -0,0 +1,34 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+env:
+  IMAGE_NAME: shinylive-nginx
+  VERSION: latest
+  CONTEXT: shinylive_without_quarto
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build the Docker image
+        run: |
+          cd $CONTEXT
+          docker build . --file Dockerfile --tag $IMAGE_NAME:$VERSION
+
+      - name: Log in to registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u token --password-stdin
+
+      - name: Push image to ghcr.io
+        run: |
+          image_id=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
+          # repository name must be lowercase
+          image_id=$(echo $image_id | tr '[A-Z]' '[a-z]')
+          docker tag $IMAGE_NAME:$VERSION $image_id:$VERSION
+          docker push $image_id:$VERSION

README.md

@@ -41,3 +41,35 @@ shiny create -d basic_app_core -t basic-app -m core
 gunicorn basic_app_core.app:app -w 4 -k uvicorn.workers.UvicornWorker
 ```
 
+## Examples
+
+* [basic_app](basic_app)
+* [basic_app_core](basic_app_core)
+* [routes_example_app](routes_example_app)
+* [shinylive_quarto](shinylive_quarto)
+* [shinylive_without_quarto](shinylive_without_quarto)
+
+## Docker Image Releases
+
+### Shinylive inside nginx
+
+```bash
+docker pull ghcr.io/eoda-dev/shinylive-nginx:latest
+
+docker run --rm -p 8085:80 ghcr.io/eoda-dev/shinylive-nginx:latest
+```
+
+Navigate to [http://localhost:8085/shinylive-app/](http://localhost:8085/shinylive-app/)
+
+### Shiny and FastAPI in one app
+
+```bash
+docker pull ghcr.io/eoda-dev/shiny-meets-fastapi:latest
+
+docker run -p 3333:3333 --rm ghcr.io/eoda-dev/shiny-meets-fastapi:latest
+```
+
+Navigate to:
+
+* Shiny app: [http://localhost:3333](http://localhost:3333)
+* FastAPI REST API docs: [http://localhost:3333/api/docs](http://localhost:3333/api/docs)

basic_app_core/README.md

@@ -6,3 +6,4 @@ docker build -t shiny-for-py/basic-app-core:1.0.0 .
 docker run -p 3333:3333 --rm -d shiny-for-py/basic-app-core:1.0.0
 ```
 
+Navigate to [http://localhost:3333](http://localhost:3333).

shinylive_quarto/README.md

@@ -11,4 +11,4 @@ quarto render index.qmd
 python -m http.server
 ```
 
-Then navigate to [localhost:8000](http://localhost:8000)
+Navigate to [http://localhost:8000](http://localhost:8000).

shinylive_without_quarto/README.md

@@ -22,7 +22,7 @@ Start local webserver to server the app:
 python3 -m http.server --directory site --bind localhost 8008
 ```
 
-Navigate to [http://localhost:8008](http://localhost:8008)
+Navigate to [http://localhost:8008](http://localhost:8008).
 
 Build Docker image to server site with Nginx:
 
@@ -32,4 +32,4 @@ docker build -t shiny-for-py/shinylive-app-nginx:1.0.0 .
 docker run -p 8085:80 --rm shiny-for-py/shinylive-app-nginx:1.0.0
 ```
 
-Navigate to [http://localhost:8085/shinylive-app/](http://localhost:8085/shinylive-app/)
+Navigate to [http://localhost:8085/shinylive-app/](http://localhost:8085/shinylive-app/).