diff --git a/.github/workflows/main-deploy.yml b/.github/workflows/main-deploy.yml index c53b91d..66dfd37 100644 --- a/.github/workflows/main-deploy.yml +++ b/.github/workflows/main-deploy.yml @@ -40,3 +40,5 @@ jobs: - name: Run E2E tests run: npm run test:e2e + env: + DATABASE_URL: "postgresql://test:test@localhost:5432/test" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 06843f8..149911d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,6 +51,12 @@ jobs: - name: Run E2E tests run: npm run test:e2e + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Build and push Docker images run: npm run docker:build-and-push diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 64bb8ac..ff0f96f 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -44,7 +44,7 @@ services: read_only: true app: - image: open-reception:${VERSION:-latest} + image: openreception/open-reception:${VERSION:-latest} container_name: open-reception-app restart: unless-stopped user: "1001:1001" diff --git a/package.json b/package.json index 8fa1d6e..f26c835 100644 --- a/package.json +++ b/package.json @@ -23,9 +23,9 @@ "docker:dev:down": "docker compose -f docker-compose.dev.yml down", "docker:dev:logs": "docker compose -f docker-compose.dev.yml logs -f", "docker:dev:clean": "docker compose -f docker-compose.dev.yml down -v --remove-orphans", - "docker:build": "docker build -t open-reception:latest .", - "docker:build:tag": "docker tag open-reception:latest open-reception:$npm_package_version", - "docker:push": "docker push open-reception:$npm_package_version && docker push open-reception:latest", + "docker:build": "docker build -t openreception/open-reception:latest .", + "docker:build:tag": "docker tag openreception/open-reception:latest openreception/open-reception:$npm_package_version", + "docker:push": "docker push openreception/open-reception:$npm_package_version && docker push openreception/open-reception:latest", "docker:build-and-push": "npm run docker:build && npm run docker:build:tag && npm run docker:push", "docker:prod:up": "docker compose -f docker-compose.prod.yml up -d", "docker:prod:down": "docker compose -f docker-compose.prod.yml down",