diff --git a/templates/redmine/0/docker-compose.yml b/templates/redmine/0/docker-compose.yml index d09199b..c4c3264 100644 --- a/templates/redmine/0/docker-compose.yml +++ b/templates/redmine/0/docker-compose.yml @@ -44,3 +44,5 @@ services: - IMAP_ENABLED=false volumes_from: - redmine-datavolume + ports: + - ${PORT}:80 diff --git a/templates/redmine/0/rancher-compose.yml b/templates/redmine/0/rancher-compose.yml index 88ebd9f..5878ed4 100644 --- a/templates/redmine/0/rancher-compose.yml +++ b/templates/redmine/0/rancher-compose.yml @@ -1,10 +1,16 @@ version: '2' catalog: name: Redmine - version: 0.1.0 + version: 0.1.2 description: | Redmine questions: + - variable: "PORT" + description: "external port to access redmine on" + label: "Port" + required: true + default: "11080" + type: "int" - variable: "TZ" description: "Timezone to use for the server" label: "Timezone" @@ -15,14 +21,14 @@ catalog: description: "Database Password to use for the server" label: "DB Password" required: true - default: "" - type: password + default: "password123" + type: string - variable: "REDMINE_SECRET_TOKEN" description: "REDMINE_SECRET_TOKEN" label: "REDMINE_SECRET_TOKEN" required: true - default: "" - type: "password" + default: "REALLYlongrandomhashkjekkckksixci" + type: "string" services: redmine: diff --git a/templates/redmine/1/docker-compose.yml b/templates/redmine/1/docker-compose.yml deleted file mode 100644 index d09199b..0000000 --- a/templates/redmine/1/docker-compose.yml +++ /dev/null @@ -1,46 +0,0 @@ -version: '2' - -services: - redmine-datavolume: - image: "busybox" - volumes: - - /home/redmine/data - - /var/lib/mysql - - /var/log/redmine - labels: - io.rancher.container.start_once: true - entrypoint: ["/bin/true"] - - db: - restart: always - image: mariadb - volumes_from: - - redmine-datavolume - labels: - io.rancher.sidekicks: redmine-datavolume - io.rancher.container.pull_image: always - environment: - - MYSQL_USER=redmine - - MYSQL_PASSWORD=${DB_PASS} - - MYSQL_ROOT_PASSWORD=${DB_PASS} - - MYSQL_DATABASE=redmine_production - - redmine: - image: sameersbn/redmine:3.3.2-1 - labels: - io.rancher.sidekicks: db,redmine-datavolume - io.rancher.container.hostname_override: container_name - io.rancher.container.pull_image: always - environment: - - PORT=${PORT} - - TZ=${TZ} - - DB_PASS=${DB_PASS} - - DB_ADAPTER=mysql2 - - DB_HOST=db - - DB_USER=redmine - - DB_NAME=redmine_production - - REDMINE_SECRET_TOKEN=${REDMINE_SECRET_TOKEN} - - SMTP_ENABLED=false - - IMAP_ENABLED=false - volumes_from: - - redmine-datavolume diff --git a/templates/redmine/1/rancher-compose.yml b/templates/redmine/1/rancher-compose.yml deleted file mode 100644 index 856608f..0000000 --- a/templates/redmine/1/rancher-compose.yml +++ /dev/null @@ -1,31 +0,0 @@ -version: '2' -catalog: - name: Redmine - version: 0.1.1 - upgrade_from: 0.1.0 - description: | - Redmine - questions: - - variable: "TZ" - description: "Timezone to use for the server" - label: "Timezone" - required: true - default: "America/Chicago" - type: "string" - - variable: "DB_PASS" - description: "Database Password to use for the server" - label: "DB Password" - required: true - default: "password123" - type: string - - variable: "REDMINE_SECRET_TOKEN" - description: "REDMINE_SECRET_TOKEN" - label: "REDMINE_SECRET_TOKEN" - required: true - default: "REALLYlongrandomhashkjekkckksixci" - type: "string" - -services: - redmine: - scale: 1 - retain_ip: true diff --git a/templates/redmine/config.yml b/templates/redmine/config.yml index f4151dc..453bbcd 100644 --- a/templates/redmine/config.yml +++ b/templates/redmine/config.yml @@ -1,5 +1,5 @@ name: Redmine description: | Redmine Project Manager -version: 0.1.1 +version: 0.1.2 category: Project Management