Skip to content

Commit 704162e

Browse files
committed
docker: use nonroot image provided by OpenKM
Since the original image misuses `VOLUME` directive and makes it impossible t actually change permissions for `/opt/tomcat`: openkm/document-management-system#364 https://support.openkm.com/tickets.php?id=13006 Signed-off-by: Jakub Sokołowski <[email protected]>
1 parent 3d8f721 commit 704162e

File tree

4 files changed

+5
-17
lines changed

4 files changed

+5
-17
lines changed

defaults/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ openkm_docker_registry_url: 'https://docker.openkm.com/'
1717
# App
1818
openkm_app_cont_name: '{{ openkm_service_name }}-app'
1919
openkm_app_cont_vol: '{{ openkm_service_path }}/app'
20-
openkm_app_cont_tag: '8.1.5'
20+
openkm_app_cont_tag: '8.1.5-nonroot'
2121
openkm_app_cont_image: 'docker.openkm.com/private/professional:{{ openkm_app_cont_tag }}'
2222
openkm_app_cont_port: 8080
23-
openkm_app_cont_uid: 33
23+
openkm_app_cont_uid: 1000
2424
# Xvfb
2525
openkm_xvfb_cont_name: '{{ openkm_service_name }}-xvfb'
2626
openkm_xvfb_cont_vol: '{{ openkm_service_path }}/xvfb'

tasks/docker.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
---
2-
- name: Create app Dockerfile
3-
template:
4-
src: 'Dockerfile.j2'
5-
dest: '{{ openkm_app_cont_vol }}/docker/Dockerfile'
6-
owner: 'dockremap'
7-
group: 'docker'
8-
mode: 0640
9-
102
- name: Create compose file
113
template:
124
src: 'docker-compose.yml.j2'

templates/Dockerfile.j2

Lines changed: 0 additions & 4 deletions
This file was deleted.

templates/docker-compose.yml.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ version: '3.7'
33
services:
44
app:
55
container_name: '{{ openkm_app_cont_name }}'
6-
build: '{{ openkm_app_cont_vol }}/docker'
7-
user: 'www-data'
6+
image: '{{ openkm_app_cont_image }}'
7+
user: 'openkm'
88
network_mode: 'host'
99
restart: 'always'
1010
stop_signal: SIGINT
@@ -26,7 +26,7 @@ services:
2626
xvfb:
2727
container_name: '{{ openkm_xvfb_cont_name }}'
2828
image: '{{ openkm_xvfb_cont_image }}'
29-
user: 'www-data'
29+
user: 'openkm'
3030
restart: 'always'
3131
entrypoint: '/usr/bin/Xvfb'
3232
command: ':1'

0 commit comments

Comments
 (0)