diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a27b975..811eaff 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -52,8 +52,8 @@ jobs: file: ./backend/Dockerfile # Explicit path to Dockerfile push: true # Push the image after building tags: | # Use SHA for version specific, latest for general - ghcr.io/${{ github.repository_owner }}/MAIA:${{ github.sha }} - ghcr.io/${{ github.repository_owner }}/MAIA:latest + ghcr.io/${{ github.repository_owner }}/maia:${{ github.sha }} + ghcr.io/${{ github.repository_owner }}/maia:latest # Pull latest base image updates when building (good for scheduled runs) pull: true cache-from: type=gha # Github Actions cache @@ -75,13 +75,13 @@ jobs: # Pull the specific image version built in this workflow # Using the Git SHA ensures we deploy exactly what was just built - docker pull ghcr.io/${{ github.repository_owner }}/MAIA:${{ github.sha }} + docker pull ghcr.io/${{ github.repository_owner }}/maia:${{ github.sha }} # Also pull latest for other services to keep up to date docker-compose pull redis db # Uses sed to update the compose file with the new image tag - sed -i 's|image: ghcr.io/${{ github.repository_owner }}/MAIA:.*|image: ghcr.io/${{ github.repository_owner }}/MAIA:${{ github.sha }}|g' docker-compose.yml + sed -i 's|image: ghcr.io/${{ github.repository_owner }}/maia:.*|image: ghcr.io/${{ github.repository_owner }}/maia:${{ github.sha }}|g' docker-compose.yml echo "Updated docker-compose.yml image tag" # Restart the services using the new image(s) diff --git a/.gitignore b/.gitignore index 3c3629e..fe019eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,24 @@ -node_modules +# backend +backend/env +backend/.env + +# frontend +interfaces/nativeapp/node_modules +interfaces/nativeapp/.expo/ +interfaces/nativeapp/dist/ +interfaces/nativeapp/web-build/ +interfaces/nativeapp/expo-env.d.ts +interfaces/nativeapp/*.orig.* +interfaces/nativeapp/*.jks +interfaces/nativeapp/*.p8 +interfaces/nativeapp/*.p12 +interfaces/nativeapp/*.key +interfaces/nativeapp/*.mobileprovision +interfaces/nativeapp/.metro-health-check* +interfaces/nativeapp/npm-debug.* +interfaces/nativeapp/yarn-debug.* +interfaces/nativeapp/yarn-error.* +interfaces/nativeapp/.DS_Store +interfaces/nativeapp/*.pem +interfaces/nativeapp/.env*.local +interfaces/nativeapp/*.tsbuildinfo diff --git a/backend/.gitignore b/backend/.gitignore deleted file mode 100644 index 40bca31..0000000 --- a/backend/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/env \ No newline at end of file diff --git a/interfaces/nativeapp/.gitignore b/interfaces/nativeapp/.gitignore deleted file mode 100644 index d16e1ef..0000000 --- a/interfaces/nativeapp/.gitignore +++ /dev/null @@ -1,36 +0,0 @@ -# Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files - -# dependencies -node_modules/ - -# Expo -.expo/ -dist/ -web-build/ -expo-env.d.ts - -# Native -*.orig.* -*.jks -*.p8 -*.p12 -*.key -*.mobileprovision - -# Metro -.metro-health-check* - -# debug -npm-debug.* -yarn-debug.* -yarn-error.* - -# macOS -.DS_Store -*.pem - -# local env files -.env*.local - -# typescript -*.tsbuildinfo