diff --git a/Dockerfile b/Dockerfile index db565ff..7d385ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM drone/drone:1 -EXPOSE 80 +EXPOSE 8097 COPY . ${WORKDIR} diff --git a/ansible/post-deploy.yml b/ansible/post-deploy.yml index 5ef47fa..4caf33a 100644 --- a/ansible/post-deploy.yml +++ b/ansible/post-deploy.yml @@ -12,7 +12,7 @@ dokku_ports: app: drone mappings: - - "http:80:80" + - "http:80:{{ drone_port }}" state: present - name: Setup LE certificates @@ -25,9 +25,22 @@ args: creates: /home/dokku/drone/letsencrypt/cron-job + - name: Specify certificate docker volume mounts + dokku_storage: + app: keycloak + mounts: + - "/home/dokku/drone/letsencrypt/certs:/etc/ssl/certs/" + + - name: Remove automatically configured ports + dokku_ports: + app: gitea + mappings: + - "http:{{ drone_port }}:{{ drone_port }}" + state: absent + - name: Set HTTP 443 port dokku_ports: app: drone mappings: - - "https:443:80" + - "https:443:{{ drone_port }}" state: present diff --git a/ansible/pre-deploy.yml b/ansible/pre-deploy.yml index d107d0f..4bcebc2 100644 --- a/ansible/pre-deploy.yml +++ b/ansible/pre-deploy.yml @@ -42,3 +42,4 @@ DRONE_RPC_SECRET: "{{ rpc_secret }}" DRONE_SERVER_HOST: "{{ domain }}" DRONE_SERVER_PROTO: "https" + DRONE_SERVER_PORT: "{{ drone_port }}" diff --git a/ansible/vars/all.yml b/ansible/vars/all.yml index 8182853..985b71e 100644 --- a/ansible/vars/all.yml +++ b/ansible/vars/all.yml @@ -2,3 +2,4 @@ domain: "drone.autonomic.zone" autonomic_admin_mail: "helo@autonomic.zone" gitea_domain: "git.autonomic.zone" +drone_port: "8097"