fix deployment

neodb-social · Oct 22, 2023 · 1b96389 · 1b96389
1 parent cd0ceff
commit 1b96389
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -12,7 +12,7 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     name: Preview Deployment
     runs-on: ubuntu-latest
-    environment: preview
+    environment: ${{ vars.DEPLOY_ENV }}
     steps:
     - name: ssh
       uses: appleboy/ssh-action@master

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ![](https://github.com/neodb-social/neodb/actions/workflows/check.yml/badge.svg?branch=main)
 ![](https://github.com/neodb-social/neodb/actions/workflows/tests.yml/badge.svg?branch=main)
-![](https://github.com/neodb-social/neodb/actions/workflows/publish.yml/badge.svg?event=push)
+![](https://github.com/neodb-social/neodb/actions/workflows/publish.yml/badge.svg?branch=main)
 
 Boofilsic/NeoDB is an open source project and free service to help users manage, share and discover collections, reviews and ratings for culture products (e.g. books, movies, music, podcasts, games and performances) in Fediverse.
 

diff --git a/compose.yml b/compose.yml
@@ -13,7 +13,7 @@ version: "3.8"
 x-shared:
   neodb-service: &neodb-service
     build: .
-    image: ${NEODB_IMAGE:-neodb/neodb:latest}
+    image: ${NEODB_IMAGE:-neodb/neodb:main}
     environment:
       NEODB_DEBUG:
       NEODB_SECRET_KEY:

diff --git a/doc/development.md b/doc/development.md
@@ -82,6 +82,15 @@ Note:
 
 To run local unit tests, use `docker compose run dev-shell neodb-manage test`
 
+Development with Github Codespace
+---------------------------------
+At the time of writing, docker compose will work in Github Codespace by adding this in `.env`:
+
+```
+NEODB_SITE_DOMAIN=${CODESPACE_NAME}-8000.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}
+```
+
+
 Applications
 ------------
 Main django apps for NeoDB:

diff --git a/neodb.env.example b/neodb.env.example
@@ -6,8 +6,6 @@
 NEODB_SECRET_KEY=change_me
 NEODB_SITE_NAME=Example Site
 NEODB_SITE_DOMAIN=example.site
-# Use this for development in Github Codespace
-# NEODB_SITE_DOMAIN=${CODESPACE_NAME}-8000.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}
 
 # Change these too
 NEODB_SITE_INTRO=/welcome.html
@@ -35,4 +33,4 @@ NEODB_SITE_LINKS=@NiceDB=https://donotban.com/@testie,@NeoDB=https://mastodon.so
 
 # pull NeoDB Docker image from a specific tag
 # see available tags: https://hub.docker.com/r/neodb/neodb/tags
-# NEODB_IMAGE=neodb/neodb:latest
+# NEODB_IMAGE=neodb/neodb:main