Test deploy (#314)

Author: dcollie2

.github/workflows/deploy-staging.yml

@@ -13,24 +13,6 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v4
 
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-
-    - name: Login to Docker Hub
-      uses: docker/login-action@v3
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-    - name: Build and push Docker image
-      uses: docker/build-push-action@v5
-      with:
-        context: .
-        push: true
-        tags: |
-          skillrx/skillrx:${{ github.sha }}
-          skillrx/skillrx:latest
-
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -58,4 +40,4 @@ jobs:
         AZURE_STORAGE_ACCOUNT_NAME: ${{ secrets.STAGING_AZURE_STORAGE_ACCOUNT_NAME }}
         AZURE_STORAGE_ACCOUNT_KEY: ${{ secrets.STAGING_AZURE_STORAGE_ACCOUNT_KEY }}
       run: |
-        bin/kamal deploy -d staging --skip-push
+        bin/kamal deploy -d staging

.kamal/secrets.production

@@ -0,0 +1,10 @@
+# Production secrets - these will be set as GitHub secrets
+KAMAL_REGISTRY_USERNAME=$KAMAL_REGISTRY_USERNAME
+KAMAL_REGISTRY_PASSWORD=$KAMAL_REGISTRY_PASSWORD
+DATABASE_URL=$DATABASE_URL
+SECRET_KEY_BASE=$SECRET_KEY_BASE
+RAILS_MASTER_KEY=$RAILS_MASTER_KEY
+AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
+AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
+AZURE_STORAGE_ACCOUNT_NAME=$AZURE_STORAGE_ACCOUNT_NAME
+AZURE_STORAGE_ACCOUNT_KEY=$AZURE_STORAGE_ACCOUNT_KEY

.kamal/secrets.staging

@@ -0,0 +1,10 @@
+# Staging secrets - these will be set as GitHub secrets
+KAMAL_REGISTRY_USERNAME=$KAMAL_REGISTRY_USERNAME
+KAMAL_REGISTRY_PASSWORD=$KAMAL_REGISTRY_PASSWORD
+DATABASE_URL=$DATABASE_URL
+SECRET_KEY_BASE=$SECRET_KEY_BASE
+RAILS_MASTER_KEY=$RAILS_MASTER_KEY
+AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
+AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
+AZURE_STORAGE_ACCOUNT_NAME=$AZURE_STORAGE_ACCOUNT_NAME
+AZURE_STORAGE_ACCOUNT_KEY=$AZURE_STORAGE_ACCOUNT_KEY

Dockerfile

@@ -71,5 +71,5 @@ USER 1000:1000
 ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 
 # Start server via Thruster by default, this can be overwritten at runtime
-EXPOSE 80
-CMD ["./bin/thrust", "./bin/rails", "server"]
+EXPOSE 3000
+CMD ["./bin/thrust", "./bin/rails", "server", "-p", "3000"]

config/deploy.production.yml

@@ -1,22 +1,18 @@
 # Production deployment configuration
-service: skillrx-production
-
-# Name of the container image.
-image: skillrx/skillrx
-
 # Deploy to production server (update with your production server IP)
 servers:
   web:
-    - 3.233.202.191
+    hosts:
+      - skillrx.org
 
 proxy:
   ssl: true
-  hosts: 
-    - skillrx.org
-    - www.skillrx.org
+  host: skillrx.org
+  app_port: 3000
 
 registry:
-  username: KAMAL_REGISTRY_USERNAME
+  username: 
+    - KAMAL_REGISTRY_USERNAME
   password:
     - KAMAL_REGISTRY_PASSWORD
 

config/deploy.staging.yml

@@ -1,22 +1,18 @@
 # Staging deployment configuration
-service: skillrx-staging
-
-# Name of the container image.
-image: skillrx/skillrx
-
 # Deploy to staging server
 servers:
   web:
-    - 98.85.96.222
+    hosts:
+      - staging.skillrx.org
 
 proxy:
+  host: staging.skillrx.org
+  app_port: 3000
   ssl: true
-  hosts: 
-    - staging.skillrx.org
-    - www.staging.skillrx.org
 
 registry:
-  username: KAMAL_REGISTRY_USERNAME
+  username: 
+    - KAMAL_REGISTRY_USERNAME
   password:
     - KAMAL_REGISTRY_PASSWORD
 
@@ -35,6 +31,7 @@ env:
     AWS_DEFAULT_REGION: us-east-1
     AWS_BUCKET_NAME: skillrx-staging
     AZURE_STORAGE_SHARE_NAME: skillrx-staging-env
+    AZURE_MEDIA_FILES_SYNC_DISABLED: "true"
     AWS_ENDPOINT_URL: ""  # Empty for real AWS
     LOCALSTACK_DEBUG: "0"
     S3_SKIP_SIGNATURE_VALIDATION: "0"

config/deploy.yml

@@ -1,5 +1,4 @@
-# Base deployment configuration
-service: skillrx
-
 # Name of the container image.
-image: skillrx/skillrx
+image: skillrx/skillrx
+service: skillrx-web
+