diff --git a/services/wipe/stack.yml b/services/wipe/stack.yml index 13b6610..3b85136 100644 --- a/services/wipe/stack.yml +++ b/services/wipe/stack.yml @@ -2,7 +2,7 @@ version: '{{ compose_version }}' services: site: - image: rycus86/podlike + image: registry.kadet.net/podlike command: -logs -ipc=false networks: ['{{ ingress_network }}'] deploy: @@ -53,12 +53,20 @@ services: configs: - source: dotenv_{{ dotenv_file.checksum }} target: /var/conf/wipe/.env + secrets: + - source: dockerregistryauth + target: /var/run/secrets/podlike/dockerregistryauth.json volumes: - /var/run/docker.sock:/var/run/docker.sock:ro - nginx-config:/mnt/nginx-config - www-data:/mnt/www-data - storage-data:/mnt/storage-data +secrets: + dockerregistryauth: + name: dockerregistryauth + external: true + configs: dotenv_{{ dotenv_file.checksum }}: file: ./config/.env diff --git a/services/wipe/tasks/pre-deploy.yml b/services/wipe/tasks/pre-deploy.yml deleted file mode 100644 index abb5c38..0000000 --- a/services/wipe/tasks/pre-deploy.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# this is needed because https://github.com/rycus86/podlike/issues/6 -- name: 'Pull all images for "{{ service }}"' - community.docker.docker_image: - name: "{{ image }}" - source: pull - force_source: yes - with_items: - - registry.kadet.net/wipe/php-fpm:{{ wipe_version }} - loop_control: - loop_var: image - notify: - - Restart services diff --git a/services/wipe/vars/main.yml b/services/wipe/vars/main.yml index d3c4ab8..bf3cde6 100644 --- a/services/wipe/vars/main.yml +++ b/services/wipe/vars/main.yml @@ -1,6 +1,6 @@ --- wipe_host: https://wipe.kadet.net -wipe_version: latest +wipe_version: '2022.1.0-dev' wipe_database: name: wipe user: wipe