Merge branch 'master' into chore/docker-compose-upgrade

fablabbcn · Sep 22, 2023 · 578f4b6 · 578f4b6
2 parents f31fffc + ec42c6f
commit 578f4b6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -58,15 +58,15 @@ jobs:
         TEST_DB_NAME: postgres
         PG_PORT: ${{ job.services.postgres.ports['5432'] }}
 
-    - name: Deploy to server via SSH
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.HOST }}
-        key: ${{ secrets.KEY }}
-        port: ${{ secrets.PORT }}
-        username: ${{ secrets.USERNAME }}
-        script: |
-          cd smartcitizen-api
-          pwd
-          ./scripts/deploy.sh
-      if: github.ref == 'refs/heads/master' && job.status == 'success'
+    #- name: Deploy to server via SSH
+      #uses: appleboy/ssh-action@master
+      #with:
+        #host: ${{ secrets.HOST }}
+        #key: ${{ secrets.KEY }}
+        #port: ${{ secrets.PORT }}
+        #username: ${{ secrets.USERNAME }}
+        #script: |
+          #cd smartcitizen-api
+          #pwd
+          #./scripts/deploy.sh
+      #if: github.ref == 'refs/heads/master' && job.status == 'success'
diff --git a/env.example b/env.example
@@ -5,7 +5,7 @@
 # They are exposed into the containers as ENV vars
 
 RAILS_ENV=development
-
+RAILS_LOG_TO_STDOUT=true # Required as of v1.3
 DATABASE_URL=postgresql://postgres:postgres@db/sc_dev
 
 TEST_DB_HOST=db