diff --git a/.env.example b/.env.example index 6aa2827..4409dcc 100644 --- a/.env.example +++ b/.env.example @@ -1,10 +1,10 @@ -# Gemfile -GEM_PG_VERSION=1.2.2 - -# docker-compose.yml - postgres -POSTGRES_USER=gtt -POSTGRES_PASSWORD=gtt -POSTGRES_DB=gtt +# docker-compose.yml - postgis +# config/database.yml +DB_HOST=postgis +DB_NAME=gtt +DB_USER=gtt +DB_PASS=gtt +DB_PORT=5432 # config/configuration.yml SMTP_ENABLE_STARTTLS_AUTO=true # (or false) diff --git a/.gitmodules b/.gitmodules index d19ef9d..eba78e1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,3 @@ [submodule "plugins/redmine_gtt_smash"] path = plugins/redmine_gtt_smash url = https://github.com/gtt-project/redmine_gtt_smash.git -[submodule "plugins/redmine_gtt_print"] - path = plugins/redmine_gtt_print - url = https://github.com/gtt-project/redmine_gtt_print.git diff --git a/Dockerfile b/Dockerfile index 4a0a719..dba0f41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,16 @@ -FROM ruby:2.7-slim-buster +FROM node:16-bullseye-slim as gtt-builder + +WORKDIR /app + +COPY plugins/redmine_gtt/ ./redmine_gtt/ + +RUN apt update; \ + apt install -y git; \ + cd redmine_gtt; \ + yarn; \ + yarn webpack + +FROM ruby:3.1-slim-bullseye as base # explicitly set uid/gid to guarantee that it won't change in the future # the values 999:999 are identical to the current user/group id assigned @@ -8,6 +20,7 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ ca-certificates \ + curl \ wget \ \ # bzr \ @@ -21,8 +34,6 @@ RUN set -eux; \ ghostscript \ gsfonts \ imagemagick \ -# https://github.com/docker-library/ruby/issues/344 - shared-mime-info \ # grab gosu for easy step-down from root gosu \ # grab tini for signal processing and zombie killing @@ -44,89 +55,57 @@ RUN set -eux; \ chown redmine:redmine "$HOME"; \ chmod 1777 "$HOME" -ARG REDMINE_VERSION="4.2.3" -ARG REDMICA_VERSION="" -# ENV REDMINE_DOWNLOAD_SHA256 ad4109c3425f1cfe4c8961f6ae6494c76e20d81ed946caa1e297d9eda13b41b4 +ENV REDMINE_VERSION="5.0.0" +ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-5.0.0.tar.gz +ENV REDMINE_DOWNLOAD_SHA256 7e840dec846646dae52fff5c631b135d1c915d6e03ea6f01ca8f12ad35803bef RUN set -eux; \ - if [ -n "$REDMINE_VERSION" ]; then \ - wget -O redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \ - # echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; - elif [ -n "$REDMICA_VERSION" ]; then \ - wget -O redmine.tar.gz "https://github.com/redmica/redmica/archive/v${REDMICA_VERSION}.tar.gz"; \ - fi; \ +# if we use wget here, we get certificate issues (https://github.com/docker-library/redmine/pull/249#issuecomment-984176479) + curl -fL -o redmine.tar.gz "$REDMINE_DOWNLOAD_URL"; \ + echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \ tar -xf redmine.tar.gz --strip-components=1; \ rm redmine.tar.gz files/delete.me log/delete.me; \ - mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \ + mkdir -p log public/plugin_assets tmp/pdf tmp/pids; \ chown -R redmine:redmine ./; \ -# log to STDOUT (https://github.com/docker-library/redmine/issues/108) - echo 'config.logger = Logger.new(STDOUT)' > config/additional_environment.rb; \ # fix permissions for running as an arbitrary user - chmod -R ugo=rwX config db sqlite; \ + chmod -R ugo=rwX config; \ find log tmp -type d -exec chmod 1777 '{}' + -# for Redmine patches -ARG PATCH_STRIP=1 -ARG PATCH_DIRS="" -COPY patches/ ./patches/ +# GTT plugin +COPY --from=gtt-builder --chown=redmine:redmine /app/ ./plugins/ + +COPY --chown=redmine:redmine config/ ./config/ -# for GTT gem native extensions -ARG GEM_PG_VERSION="1.2.3" -COPY Gemfile.local ./ -COPY plugins/ ./plugins/ +COPY --chown=redmine:redmine Gemfile.local ./ + +# Other plugins +COPY --chown=redmine:redmine plugins/redmine_gtt_smash/ ./plugins/redmine_gtt_smash/ +COPY --chown=redmine:redmine plugins/redmine_text_blocks/ ./plugins/redmine_text_blocks/ + +# Themes (if exists) +COPY --chown=redmine:redmine public/themes/ ./public/themes/ + +FROM base RUN set -eux; \ \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + # default-libmysqlclient-dev \ # freetds-dev \ gcc \ - # libmariadbclient-dev \ libpq-dev \ # libsqlite3-dev \ make \ patch \ -# in 4.1+, libmagickcore-dev and libmagickwand-dev are no longer necessary/used: https://www.redmine.org/issues/30492 - libmagickcore-dev libmagickwand-dev \ # for GTT dependencies - g++ \ libgeos-dev \ - curl \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - if [ -n "$PATCH_DIRS" ]; then \ - for dir in $(echo $PATCH_DIRS | sed "s/,/ /g"); do \ - for file in ./patches/"$dir"/*; do \ - patch -p"$PATCH_STRIP" < $file; \ - done; \ - done; \ - rm -rf ./patches/*; \ - fi; \ - curl -sL https://deb.nodesource.com/setup_14.x | bash -; \ - apt-get install -y --no-install-recommends nodejs; \ - curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -; \ - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list; \ - apt-get update; \ - apt-get install -y --no-install-recommends yarn; \ - for plugin in ./plugins/*; do \ - if [ -f "$plugin/webpack.config.js" ]; then \ - cd "$plugin" && yarn && npx webpack && rm -rf node_modules && cd ../..; \ - fi; \ - done; \ - export GEM_PG_VERSION="$GEM_PG_VERSION"; \ gosu redmine bundle config --local without 'development test'; \ -# fill up "database.yml" with bogus entries so the redmine Gemfile will pre-install all database adapter dependencies -# https://github.com/redmine/redmine/blob/e9f9767089a4e3efbd73c35fc55c5c7eb85dd7d3/Gemfile#L50-L79 - echo '# the following entries only exist to force `bundle install` to pre-install all database adapter dependencies -- they can be safely removed/ignored' > ./config/database.yml; \ - # for adapter in mysql2 postgresql sqlserver sqlite3; do \ - for adapter in postgis; do \ - echo "$adapter:" >> ./config/database.yml; \ - echo " adapter: $adapter" >> ./config/database.yml; \ - done; \ gosu redmine bundle install --jobs "$(nproc)"; \ - rm ./config/database.yml; \ # fix permissions for running as an arbitrary user chmod -R ugo=rwX Gemfile.lock "$GEM_HOME"; \ rm -rf ~redmine/.bundle; \ @@ -145,7 +124,6 @@ RUN set -eux; \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -COPY config/ ./config/ VOLUME /usr/src/redmine/files COPY docker-entrypoint.sh / diff --git a/Gemfile.local b/Gemfile.local index 64e8352..18940b0 100644 --- a/Gemfile.local +++ b/Gemfile.local @@ -1,5 +1 @@ -source 'https://rubygems.org' - -# each plugin's native extensions should be added to here -gem "rgeo" -gem "pg", (ENV['GEM_PG_VERSION'] ? "~> #{ENV['GEM_PG_VERSION']}" : "~> 1.2.3") +gem 'puma' diff --git a/config/additional_environment.rb b/config/additional_environment.rb new file mode 100644 index 0000000..983280a --- /dev/null +++ b/config/additional_environment.rb @@ -0,0 +1,11 @@ +# Copy this file to additional_environment.rb and add any statements +# that need to be passed to the Rails::Initializer. `config` is +# available in this context. +# +# Example: +# +# config.log_level = :debug +# ... +# + +config.logger = Logger.new(STDOUT) diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 0000000..6be21a9 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,17 @@ +default: &default + adapter: postgis + database: <%= ENV['DB_NAME'] %> + host: <%= ENV['DB_HOST'] %> + username: <%= ENV['DB_USER'] %> + password: <%= ENV['DB_PASS'] %> + port: <%= ENV['DB_PORT'] || 5432 %> + encoding: utf8 + +production: + <<: *default + +test: + <<: *default + +development: + <<: *default diff --git a/docker-compose.yml b/docker-compose.yml index cc5cf32..61ea11d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,68 +1,35 @@ version: "3" services: + postgis: + image: postgis/postgis:14-3.2 + environment: + POSTGRES_PASSWORD: ${DB_PASS} + POSTGRES_USER: ${DB_USER} + POSTGRES_DB: ${DB_NAME} + volumes: + - postgis:/var/lib/postgresql/data + healthcheck: + test: "pg_isready -h postgis -U ${DB_USER} -d ${DB_NAME}" + interval: 10s + timeout: 2s + retries: 5 + start_period: 10s - gtt: + redmine: build: - context: ./ - dockerfile: ./Dockerfile - args: - REDMINE_VERSION: 4.2.3 - REDMICA_VERSION: "" - GEM_PG_VERSION: ${GEM_PG_VERSION} - PATCH_STRIP: 1 - PATCH_DIRS: "" + context: . ports: - 3000:3000 - environment: - REDMINE_DB_POSTGRES: postgres - REDMINE_DB_USERNAME: ${POSTGRES_USER} - REDMINE_DB_PASSWORD: ${POSTGRES_PASSWORD} - REDMINE_DB_DATABASE: ${POSTGRES_DB} - REDMINE_PLUGINS_MIGRATE: 1 - # Gemfile - GEM_PG_VERSION: ${GEM_PG_VERSION} - # config/configuration.yml - SMTP_ENABLE_STARTTLS_AUTO: ${SMTP_ENABLE_STARTTLS_AUTO} - SMTP_ADDRESS: ${SMTP_ADDRESS} - SMTP_PORT: ${SMTP_PORT} - SMTP_DOMAIN: ${SMTP_DOMAIN} - SMTP_AUTHENTICATION: ${SMTP_AUTHENTICATION} - SMTP_USER_NAME: ${SMTP_USER_NAME} - SMTP_PASSWORD: ${SMTP_PASSWORD} + env_file: + - .env volumes: - ./files:/usr/src/redmine/files - ./plugins:/usr/src/redmine/plugins - ./public/themes:/usr/src/redmine/public/themes - # Exclude node package and webpack contents folders - - /usr/src/redmine/plugins/redmine_gtt/node_modules - - /usr/src/redmine/plugins/redmine_gtt/assets/javascripts depends_on: - - postgres - - mapfish-print - restart: always - - postgres: - image: postgis/postgis:13-3.1 - environment: - POSTGRES_USER: ${POSTGRES_USER} - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} - POSTGRES_DB: ${POSTGRES_DB} - volumes: - - postgres:/var/lib/postgresql/data - restart: always - - mapfish-print: - image: camptocamp/mapfish_print:3.28 - ports: - - 8080:8080 - environment: - EXTRA_JARS: /usr/local/tomcat/webapps/ROOT/print-apps/lib - volumes: - - ./mapfish-print-apps:/usr/local/tomcat/webapps/ROOT/print-apps - restart: always + postgis: + condition: service_healthy volumes: - gtt: - postgres: - mapfish-print: + postgis: diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 7b6e8b9..0e4df76 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -2,156 +2,11 @@ set -Eeo pipefail # TODO add "-u" -# usage: file_env VAR [DEFAULT] -# ie: file_env 'XYZ_DB_PASSWORD' 'example' -# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of -# "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature) -file_env() { - local var="$1" - local fileVar="${var}_FILE" - local def="${2:-}" - if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then - echo >&2 "error: both $var and $fileVar are set (but are exclusive)" - exit 1 - fi - local val="$def" - if [ "${!var:-}" ]; then - val="${!var}" - elif [ "${!fileVar:-}" ]; then - val="$(< "${!fileVar}")" - fi - export "$var"="$val" - unset "$fileVar" -} - -isLikelyRedmine= -case "$1" in - rails | rake | passenger ) isLikelyRedmine=1 ;; -esac - -_fix_permissions() { - # https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions - if [ "$(id -u)" = '0' ]; then - find config files log public/plugin_assets \! -user redmine -exec chown redmine:redmine '{}' + - fi - # directories 755, files 644: - find config files log public/plugin_assets tmp -type d \! -perm 755 -exec chmod 755 '{}' + 2>/dev/null || : - find config files log public/plugin_assets tmp -type f \! -perm 644 -exec chmod 644 '{}' + 2>/dev/null || : -} - -# allow the container to be started with `--user` -if [ -n "$isLikelyRedmine" ] && [ "$(id -u)" = '0' ]; then - _fix_permissions - exec gosu redmine "$BASH_SOURCE" "$@" -fi - -if [ -n "$isLikelyRedmine" ]; then - _fix_permissions - if [ ! -f './config/database.yml' ]; then - file_env 'REDMINE_DB_MYSQL' - file_env 'REDMINE_DB_POSTGRES' - file_env 'REDMINE_DB_SQLSERVER' - - if [ "$MYSQL_PORT_3306_TCP" ] && [ -z "$REDMINE_DB_MYSQL" ]; then - export REDMINE_DB_MYSQL='mysql' - elif [ "$POSTGRES_PORT_5432_TCP" ] && [ -z "$REDMINE_DB_POSTGRES" ]; then - export REDMINE_DB_POSTGRES='postgres' - fi - - if [ "$REDMINE_DB_MYSQL" ]; then - adapter='mysql2' - host="$REDMINE_DB_MYSQL" - file_env 'REDMINE_DB_PORT' '3306' - file_env 'REDMINE_DB_USERNAME' "${MYSQL_ENV_MYSQL_USER:-root}" - file_env 'REDMINE_DB_PASSWORD' "${MYSQL_ENV_MYSQL_PASSWORD:-${MYSQL_ENV_MYSQL_ROOT_PASSWORD:-}}" - file_env 'REDMINE_DB_DATABASE' "${MYSQL_ENV_MYSQL_DATABASE:-${MYSQL_ENV_MYSQL_USER:-redmine}}" - file_env 'REDMINE_DB_ENCODING' '' - elif [ "$REDMINE_DB_POSTGRES" ]; then - # adapter='postgresql' - adapter='postgis' - host="$REDMINE_DB_POSTGRES" - file_env 'REDMINE_DB_PORT' '5432' - file_env 'REDMINE_DB_USERNAME' "${POSTGRES_ENV_POSTGRES_USER:-postgres}" - file_env 'REDMINE_DB_PASSWORD' "${POSTGRES_ENV_POSTGRES_PASSWORD}" - file_env 'REDMINE_DB_DATABASE' "${POSTGRES_ENV_POSTGRES_DB:-${REDMINE_DB_USERNAME:-}}" - file_env 'REDMINE_DB_ENCODING' 'utf8' - elif [ "$REDMINE_DB_SQLSERVER" ]; then - adapter='sqlserver' - host="$REDMINE_DB_SQLSERVER" - file_env 'REDMINE_DB_PORT' '1433' - file_env 'REDMINE_DB_USERNAME' '' - file_env 'REDMINE_DB_PASSWORD' '' - file_env 'REDMINE_DB_DATABASE' '' - file_env 'REDMINE_DB_ENCODING' '' - else - echo >&2 - echo >&2 'warning: missing REDMINE_DB_MYSQL, REDMINE_DB_POSTGRES, or REDMINE_DB_SQLSERVER environment variables' - echo >&2 - echo >&2 '*** Using sqlite3 as fallback. ***' - echo >&2 - - adapter='sqlite3' - host='localhost' - file_env 'REDMINE_DB_PORT' '' - file_env 'REDMINE_DB_USERNAME' 'redmine' - file_env 'REDMINE_DB_PASSWORD' '' - file_env 'REDMINE_DB_DATABASE' 'sqlite/redmine.db' - file_env 'REDMINE_DB_ENCODING' 'utf8' - - mkdir -p "$(dirname "$REDMINE_DB_DATABASE")" - if [ "$(id -u)" = '0' ]; then - find "$(dirname "$REDMINE_DB_DATABASE")" \! -user redmine -exec chown redmine '{}' + - fi - fi - - REDMINE_DB_ADAPTER="$adapter" - REDMINE_DB_HOST="$host" - echo "$RAILS_ENV:" > config/database.yml - for var in \ - adapter \ - host \ - port \ - username \ - password \ - database \ - encoding \ - ; do - env="REDMINE_DB_${var^^}" - val="${!env}" - [ -n "$val" ] || continue - echo " $var: \"$val\"" >> config/database.yml - done - fi - - # install additional gems for Gemfile.local and plugins - bundle check || bundle install - - if [ ! -s config/secrets.yml ]; then - file_env 'REDMINE_SECRET_KEY_BASE' - if [ -n "$REDMINE_SECRET_KEY_BASE" ]; then - cat > 'config/secrets.yml' <<-YML - $RAILS_ENV: - secret_key_base: "$REDMINE_SECRET_KEY_BASE" - YML - elif [ ! -f config/initializers/secret_token.rb ]; then - rake generate_secret_token - fi - fi - if [ "$1" != 'rake' -a -z "$REDMINE_NO_DB_MIGRATE" ]; then - rake db:migrate - fi - - if [ "$1" != 'rake' -a -n "$REDMINE_PLUGINS_MIGRATE" ]; then - rake redmine:plugins:migrate - fi - - # remove PID file to enable restarting the container - rm -f tmp/pids/server.pid - - if [ "$1" = 'passenger' ]; then - # Don't fear the reaper. - set -- tini -- "$@" - fi -fi +# install additional gems for Gemfile.local and plugins +bundle check || bundle install +rake generate_secret_token +rake db:migrate +rake redmine:plugins:migrate +rm -f tmp/pids/server.pid exec "$@" diff --git a/mapfish-print-apps/default-list/config.yaml b/mapfish-print-apps/default-list/config.yaml deleted file mode 100644 index edb5934..0000000 --- a/mapfish-print-apps/default-list/config.yaml +++ /dev/null @@ -1,28 +0,0 @@ -throwErrorOnExtraParameters: true -transparentTileErrorColor: "rgba(78, 78, 255, 125)" -opaqueTileErrorColor: "rgba(255, 155, 155, 0)" - -pdfConfig: !pdfConfig - author: "GTT" - subject: "GTT Print" - -templates: - default-list: !template - reportTemplate: default-list.jrxml - - attributes: - custom_text: !string - default: "" - datasource: !datasource - attributes: - table: !table {} - - processors: - - !reportBuilder - directory: '.' - - !createDataSource - reportTemplate: table.jrxml - reportKey: reportTemplate - processors: - - !prepareTable {} - tableData: jrDataSource diff --git a/mapfish-print-apps/default-list/default-list.jrxml b/mapfish-print-apps/default-list/default-list.jrxml deleted file mode 100644 index d74735d..0000000 --- a/mapfish-print-apps/default-list/default-list.jrxml +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mapfish-print-apps/default-list/requestData-default-list.json b/mapfish-print-apps/default-list/requestData-default-list.json deleted file mode 100644 index 8fefe0f..0000000 --- a/mapfish-print-apps/default-list/requestData-default-list.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "layout": "default-list", - "outputFilename": "gtt-print-default-list", - "outputFormat": "pdf", - "attributes": { - "custom_text": "Custom Text", - "datasource": [ - { - "table" : { - "columns": ["id", "status", "start_date", "created_on", "assigned_to_name", "subject"], - "data": [ - ["1", "New", "2018/06/24", "2018/06/24 10:11", "user1", "Title1"], - ["2", "New", "2018/06/24", "2018/06/24 10:05", "user2", "Title2"], - ["3", "New", "2018/06/22", "2018/06/22 14:41", "user3", "Title3"] - ] - } - } - ] - } -} diff --git a/mapfish-print-apps/default-list/table.jrxml b/mapfish-print-apps/default-list/table.jrxml deleted file mode 100644 index b2a4aab..0000000 --- a/mapfish-print-apps/default-list/table.jrxml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mapfish-print-apps/default/blank.png b/mapfish-print-apps/default/blank.png deleted file mode 100644 index 928ea48..0000000 Binary files a/mapfish-print-apps/default/blank.png and /dev/null differ diff --git a/mapfish-print-apps/default/config.yaml b/mapfish-print-apps/default/config.yaml deleted file mode 100644 index f409f16..0000000 --- a/mapfish-print-apps/default/config.yaml +++ /dev/null @@ -1,76 +0,0 @@ -throwErrorOnExtraParameters: false -transparentTileErrorColor: "rgba(78, 78, 255, 125)" -opaqueTileErrorColor: "rgba(255, 155, 155, 0)" - -pdfConfig: !pdfConfig - author: "GTT" - subject: "GTT Print" - -templates: - default: !template - reportTemplate: default.jrxml - attributes: - id: !string - default: "" - subject: !string - default: "" - project_id: !string - default: "" - project_name: !string - default: "" - tracker_id: !string - default: "" - tracker_name: !string - default: "" - status_id: !string - default: "" - status_name: !string - default: "" - priority_id: !string - default: "" - priority_name: !string - default: "" - author_id: !string - default: "" - author_name: !string - default: "" - assigned_to_id: !string - default: "" - assigned_to_name: !string - default: "" - description: !string - default: "" - is_private: !string - default: "" - start_date: !string - default: "" - done_date: !string - default: "" - estimated_hours: !string - default: "" - created_on: !string - default: "" - updated_on: !string - default: "" - custom_text: !string - default: "" - last_notes: !string - default: "" - image_url_1: !string - default: "../default/blank.png" - image_url_2: !string - default: "../default/blank.png" - image_url_3: !string - default: "../default/blank.png" - image_url_4: !string - default: "../default/blank.png" - map: !map - maxDpi: 400 - width: 555 - height: 330 - processors: - - !reportBuilder - directory: '.' - - !forwardHeaders - headers: [Referer, User-Agent] - - !createMap {} diff --git a/mapfish-print-apps/default/default.jrxml b/mapfish-print-apps/default/default.jrxml deleted file mode 100644 index 5e322fb..0000000 --- a/mapfish-print-apps/default/default.jrxml +++ /dev/null @@ -1,376 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <band height="50" splitType="Stretch"> - <textField> - <reportElement x="0" y="0" width="555" height="50" forecolor="#187ECC" uuid="57b12e72-666c-476c-b42e-a7a625883b1d"/> - <textElement textAlignment="Center"> - <font fontName="IPAex Gothic" pdfEncoding="Identity-H"/> - </textElement> - <textFieldExpression><![CDATA[$P{subject}]]></textFieldExpression> - </textField> - </band> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mapfish-print-apps/default/requestData-default.json b/mapfish-print-apps/default/requestData-default.json deleted file mode 100644 index 51b3581..0000000 --- a/mapfish-print-apps/default/requestData-default.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "layout": "default", - "outputFilename": "gtt-print-default", - "outputFormat": "pdf", - "attributes": { - "id": "", - "subject": "", - "project_id": "", - "project_name": "", - "tracker_id": "", - "tracker_name": "", - "status_id": "", - "status_name": "", - "priority_id": "", - "priority_name": "", - "author_id": "", - "author_name": "", - "assigned_to_id": "", - "assigned_to_name": "", - "description": "", - "is_private": "", - "start_date": "", - "done_date": "", - "estimated_hours": "", - "created_on": "", - "updated_on": "", - "custom_text": "", - "last_notes": "", - "image_url_1": "../default/blank.png", - "image_url_2": "../default/blank.png", - "image_url_3": "../default/blank.png", - "image_url_4": "../default/blank.png", - "map": { - "longitudeFirst": true, - "center": [15058094, 4121732], - "scale": 25000, - "projection": "EPSG:3857", - "dpi": 144, - "rotation": 0, - "layers": [{ - "type": "geojson", - "geoJson": { - "type": "FeatureCollection", - "features": [{ - "type": "Feature", - "properties": { - "name": "default" - }, - "geometry": { - "type": "Point", - "coordinates": [15058094, 4121732] - } - }] - }, - "style": { - "version": "2", - "val1" : "#FF4500", - "*": { - "symbolizers": [ - { - "type" : "point", - "fillColor":"#FF0000", - "fillOpacity": 0, - "rotation" : "30", - - "graphicName": "circle", - "graphicOpacity": 0.4, - "pointRadius": 8, - - "strokeColor":" ${val1}", - "strokeOpacity": 1, - "strokeWidth": 5, - "strokeLinecap": "round", - "strokeDashstyle": "solid" - } - ] - } - } - },{ - "type": "osm", - "baseURL": "https://c.tile.openstreetmap.org", - "imageExtension": "png" - }] - } - } -} diff --git a/mapfish-print-apps/lib/ipaex.jar b/mapfish-print-apps/lib/ipaex.jar deleted file mode 100644 index 9e54d99..0000000 Binary files a/mapfish-print-apps/lib/ipaex.jar and /dev/null differ diff --git a/plugins/redmine_gtt b/plugins/redmine_gtt index 68f3b40..316a255 160000 --- a/plugins/redmine_gtt +++ b/plugins/redmine_gtt @@ -1 +1 @@ -Subproject commit 68f3b402a96380be4192912e38e6b9d2b419b593 +Subproject commit 316a2550a9290c08fb7fd119285b7edfac65b78a diff --git a/plugins/redmine_gtt_print b/plugins/redmine_gtt_print deleted file mode 160000 index 6d67a3c..0000000 --- a/plugins/redmine_gtt_print +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6d67a3c7b6eee3c7645c26d41d66901824287e8d diff --git a/plugins/redmine_gtt_smash b/plugins/redmine_gtt_smash index 3863ef9..22716c5 160000 --- a/plugins/redmine_gtt_smash +++ b/plugins/redmine_gtt_smash @@ -1 +1 @@ -Subproject commit 3863ef9f36c31d46c109c3491f885470ec83ab3b +Subproject commit 22716c5d5d7581867cad0b0ba3b47279ccdf0842 diff --git a/plugins/redmine_text_blocks b/plugins/redmine_text_blocks index 88a6021..f4bf2ea 160000 --- a/plugins/redmine_text_blocks +++ b/plugins/redmine_text_blocks @@ -1 +1 @@ -Subproject commit 88a602179327e7c2042304c86f2af1298ae614db +Subproject commit f4bf2ea5e11b15064bf0b7309866aa072340f482