diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 40e596a..9807dfe 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -65,7 +65,6 @@ jobs: if [ -n "${{ vars.PDS_CITIES_HOSTNAME }}" ]; then cat >> vars/main.yml <` | Labeler account handle | | `pds_cities_app_password` | yes (if enabled) | — | Labeler account app password with DM access | @@ -222,7 +221,6 @@ Auto-deploys on push to `main`. Set up these in Gitea repo settings (Settings > | `PDS_SERVICE_NAME` | *(optional)* PDS display name for branding | | `PDS_PRIMARY_COLOR` | *(optional)* Primary color (hex) for branding | | `PDS_CITIES_HOSTNAME` | *(optional)* Set to deploy the cities labeler at this hostname | -| `PDS_CITIES_REPO` | *(with cities)* Git URL of the labeler repo | Outgoing emails are sent from `techops@cosocial.ca` (fixed in the workflow). diff --git a/playbook.yml b/playbook.yml index 215b2ab..f16f782 100644 --- a/playbook.yml +++ b/playbook.yml @@ -192,16 +192,6 @@ when: pds_operator_enabled is defined and pds_operator_enabled | bool notify: restart operator - - name: Clone cities labeler repo - git: - repo: "{{ pds_cities_repo }}" - dest: "{{ pds_data_dir }}/cities" - version: "{{ pds_cities_version | default('main') }}" - update: yes - force: no - when: pds_cities_enabled is defined and pds_cities_enabled | bool - notify: restart cities - - name: Create cities labeler data directory file: path: "{{ pds_data_dir }}/cities/data" @@ -315,4 +305,4 @@ shell: cd {{ pds_data_dir }}/operator && docker compose up -d --build - name: restart cities - shell: cd {{ pds_data_dir }}/cities && docker compose up -d --build + shell: cd {{ pds_data_dir }}/cities && docker compose pull && docker compose up -d diff --git a/templates/cities-labeler-compose.yaml.j2 b/templates/cities-labeler-compose.yaml.j2 index a79c0e9..b3462bc 100644 --- a/templates/cities-labeler-compose.yaml.j2 +++ b/templates/cities-labeler-compose.yaml.j2 @@ -5,7 +5,7 @@ name: cities-labeler services: app: - build: . + image: {{ pds_cities_image | default('git.cosocial.info/cosocial-canada/atproto-cosocial-labeler:latest') }} env_file: .env ports: - "127.0.0.1:4100:4100" diff --git a/vars/main.yml.example b/vars/main.yml.example index 7d946f1..f65f7a2 100644 --- a/vars/main.yml.example +++ b/vars/main.yml.example @@ -59,8 +59,7 @@ pds_operator_hostname: pds-operator.cosocial.ca # Cities labeler (DM-driven city badges, serves labels at pds_cities_hostname) # pds_cities_enabled: true -# pds_cities_repo: https://git.cosocial.info/CoSocial-Canada/atproto-cosocial-labeler.git -# pds_cities_version: main +# pds_cities_image: git.cosocial.info/cosocial-canada/atproto-cosocial-labeler:latest # pds_cities_hostname: cities-labeler.cosocial.ca # pds_cities_handle: cities.pds.cosocial.ca # pds_cities_app_password: CHANGE_ME # app password with DM access