Skip to content

Commit

Permalink
fix: removed redundant Dockerfile thanks to outline patch
Browse files Browse the repository at this point in the history
  • Loading branch information
SilasPeters committed Oct 1, 2024
1 parent 40953f5 commit bfe059f
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 37 deletions.
17 changes: 3 additions & 14 deletions ansible/roles/outline/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,10 @@
mode: "0600"
notify: "trigger outline migration"

- name: "Create outline 'Dockerfile'"
- name: "Create outline '.env' file"
ansible.builtin.template:
src: "Dockerfile.j2"
dest: "{{ outline_config.project_source }}/Dockerfile"
owner: "outline"
group: "outline"
mode: "0600"
notify: "trigger outline migration"
register: "dockerfile"

- name: "Create outline 'docker.env' file"
ansible.builtin.template:
src: "docker.env.j2"
dest: "{{ outline_config.project_source }}/docker.env"
src: ".env.j2"
dest: "{{ outline_config.project_source }}/.env"
owner: "outline"
group: "outline"
mode: "0600"
Expand Down Expand Up @@ -90,7 +80,6 @@
ansible.builtin.include_tasks: "../docker/tasks/compose-up.yml"
vars:
project_source: "{{ outline_config.project_source }}"
remove_images: "{{ 'local' if dockerfile.changed else omit }}" # Rebuild the image if file changed

- name: "Install nginx config"
ansible.builtin.template:
Expand Down
File renamed without changes.
17 changes: 0 additions & 17 deletions ansible/roles/outline/templates/Dockerfile.j2

This file was deleted.

15 changes: 10 additions & 5 deletions ansible/roles/outline/templates/docker-compose.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,18 @@
services:

outline:
build:
dockerfile: Dockerfile
env_file: ./docker.env
image: outlinewiki/outline:{{ outline_config.version }}
restart: on-failure:3
# ports:
# - "4568:3000"
network_mode: host # TODO replace this
healthcheck:
test: [
"CMD", "wget", "-qO-", "http://localhost:${PORT}/_health", "|", "grep", "-q", "OK",
"&&", "wget", "-qO-", "https://hc-ping.com/{{ secret_healthchecks_io.ping_key }}/outline",
"||", "exit", "1"
]
interval: 5m
start_period: 30s
start_interval: 10s
volumes:
- storage-data:/var/lib/outline/data
# depends_on:
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/outline/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

outline_config:
project_source: "/var/www/outline/outline"
version: "0.78.0" # Git tag
version: "0.79.0" # Git tag

0 comments on commit bfe059f

Please sign in to comment.