diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d48c963..1c063de 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -41,31 +41,9 @@ jobs: username: hschne password: ${{ secrets.DOCKER_REGISTRY_KEY }} - - name: Set Tag - id: tag - run: | - if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then - GITHUB_SHA=${{ github.event.pull_request.head.sha }} - fi - echo "tag=$(git rev-parse "$GITHUB_SHA")" >> $GITHUB_OUTPUT - - - name: Build Image - uses: docker/build-push-action@v5 - with: - context: . - builder: ${{ steps.buildx.outputs.name }} - push: true - labels: | - "service=data-dead-drop" - tags: | - "hschne/data-dead-drop:latest" - "hschne/data-dead-drop:${{ steps.tag.outputs.tag }}" - cache-from: type=gha - cache-to: type=gha,mode=max - - uses: webfactory/ssh-agent@v0.7.0 with: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - name: Deploy command - run: bundle exec kamal deploy --skip-push + run: bundle exec dotenv kamal deploy diff --git a/config/deploy.yml b/config/deploy.yml index bb0c45e..e5f9e39 100644 --- a/config/deploy.yml +++ b/config/deploy.yml @@ -59,26 +59,11 @@ env: # limit: 10 # Can also specify as a percentage of total hosts, such as "25%" # wait: 2 -# Use accessory services (secrets come from .kamal/secrets). -# -# accessories: -# db: -# image: mysql:8.0 -# host: 192.168.0.2 -# port: 3306 -# env: -# clear: -# MYSQL_ROOT_HOST: '%' -# secret: -# - MYSQL_ROOT_PASSWORD -# files: -# - config/mysql/production.cnf:/etc/mysql/my.cnf -# - db/production.sql:/docker-entrypoint-initdb.d/setup.sql -# directories: -# - data:/var/lib/mysql -# redis: -# image: redis:7.0 -# host: 192.168.0.2 -# port: 6379 -# directories: -# - data:/data +accessories: + monitoring: + image: hschne/puny-monitor:latest + host: 159.69.18.121 + port: 4567 + directories: + - /:/host:ro,rslave + - puny-data:/puny-monitor/db