diff --git a/.github/workflows/epicmorg.base.images.current.atlassian.yml b/.github/workflows/epicmorg.base.images.current.atlassian.yml index 9e168e872..f5608f6b2 100644 --- a/.github/workflows/epicmorg.base.images.current.atlassian.yml +++ b/.github/workflows/epicmorg.base.images.current.atlassian.yml @@ -34,8 +34,8 @@ jobs: # - name: "Build and Deploy Atlassian Fisheye Image:" # run: cd linux/ecosystem/atlassian/fisheye/latest && pwd && make build && make deploy - - name: "Build and Deploy Atlassian Fisheye + Crucible Image:" - run: cd linux/ecosystem/atlassian/fisheye-crucible/latest && pwd && make build && make deploy +# - name: "Build and Deploy Atlassian Fisheye + Crucible Image:" +# run: cd linux/ecosystem/atlassian/fisheye-crucible/latest && pwd && make build && make deploy - name: "Build and Deploy Atlassian Jira Image:" run: cd linux/ecosystem/atlassian/jira/latest && pwd && make build && make deploy diff --git a/.github/workflows/epicmorg.base.images.postgresql.yml b/.github/workflows/epicmorg.base.images.postgresql.yml index ab48d124b..71c18ec96 100644 --- a/.github/workflows/epicmorg.base.images.postgresql.yml +++ b/.github/workflows/epicmorg.base.images.postgresql.yml @@ -116,8 +116,11 @@ jobs: - name: "Build and Deploy PostgreSQL 16 Image:" run: cd linux/ecosystem/postgres/16 && pwd && make build && make deploy - - name: "Build and Deploy PostgreSQL 17 Image:" - run: cd linux/ecosystem/postgres/17 && pwd && make build && make deploy +# - name: "Build and Deploy PostgreSQL 17 Image:" +# run: cd linux/ecosystem/postgres/17 && pwd && make build && make deploy + +# - name: "Build and Deploy PostgreSQL 18 Image:" +# run: cd linux/ecosystem/postgres/18 && pwd && make build && make deploy ################################################################################## diff --git a/CHANGELOG.md b/CHANGELOG.md index 99f7a9136..988f9bb1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,15 @@ ## 2024 * `dec` * migrated `qbittorrent` images to new baseline + * fixed `perforce` iamges and migrated to new baseline + * updated `Atlassian Images`: + * Migrated to new baseline all `Jira` iamges + * Updated to new versions of `Jira` * `sep`, `oct`, `nov` - * fixed some bugs in `Makefile` - * fixed `Dockerfile` bugs - * added `Nextcloud` version `30` in `tag`. + * fixed some bugs in `Makefile` + * fixed `Dockerfile` bugs + * added `Nextcloud` version `30` in `tag`. + * `aug` * `sentry` and `redash` was set to `experimental` status bacause `ci` is not stable yet. * reworked `teamcity:server` image. @@ -24,7 +29,7 @@ * `WIP`: reworking by new concept of base images and creating new `nginx 1.27.0` with static build. * `july` * Start migration from `Odrey's` repos due to author's rot. - * [@oerdnj](https://github.com/oerdnj) go to hell, [xenophobe](https://github.com/oerdnj/deb.sury.org/issues/2155)! :fu: + * [@oerdnj](https://github.com/oerdnj) go to hell, [xenophobe](https://github.com/oerdnj/deb.sury.org/issues/2155)! :fu: ``` You say that "I do understand the difference between a government and its people." and contradict yourself ("you are part of the problem") by equating people and the government. diff --git a/Makefile b/Makefile index 87c0a137a..1057a385e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = "2024.11.27" +VERSION = "2024.12.03" AUTHOR = "EpicMorg" MODIFIED = "STAM" DOCKER_SCAN_SUGGEST = false @@ -1069,7 +1069,8 @@ ecosystem-postgres-images: cd `pwd`/linux/ecosystem/postgres/14 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/postgres/15 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/postgres/16 && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/postgres/17 && pwd && make build && make deploy +# cd `pwd`/linux/ecosystem/postgres/17 && pwd && make build && make deploy +# cd `pwd`/linux/ecosystem/postgres/18 && pwd && make build && make deploy ecosystem-teamcity-agent-images: cd `pwd`/linux/ecosystem/teamcity/agent/latest/jdk8 && pwd && make build && make deploy @@ -1734,6 +1735,7 @@ ecosystem-jira-9-images: cd `pwd`/linux/ecosystem/atlassian/jira/9/9.3.0 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/atlassian/jira/9/9.3.1 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/atlassian/jira/9/9.3.2 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.3.3 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/atlassian/jira/9/9.5.0 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/atlassian/jira/9/9.5.1 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/atlassian/jira/9/9.6.0 && pwd && make build && make deploy @@ -1752,7 +1754,6 @@ ecosystem-jira-9-images: cd `pwd`/linux/ecosystem/atlassian/jira/9/9.11.3 && pwd && make build && make deploy ecosystem-jira-9-lts-images: - cd `pwd`/linux/ecosystem/atlassian/jira/9/9.3.3 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.0 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.1 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.2 && pwd && make build && make deploy @@ -1769,15 +1770,49 @@ ecosystem-jira-9-lts-images: cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.13 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.14 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.15 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.16 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.17 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.18 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.19 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.20 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.21 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.22 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.23 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.24 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.25 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.26 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.27 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.28 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.4.29 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/atlassian/jira/9/9.12.0 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/atlassian/jira/9/9.12.1 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/atlassian/jira/9/9.12.2 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.12.3 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.12.4 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.12.5 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.12.6 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.12.7 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.12.8 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.12.9 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.12.10 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.12.11 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.12.12 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.12.13 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.12.14 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/9/9.12.15 && pwd && make build && make deploy + +ecosystem-jira-10-images: + cd `pwd`/linux/ecosystem/atlassian/jira/10/10.0.0 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/10/10.0.1 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/10/10.1.1 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/10/10.1.2 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/10/10.2.0 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/10/10.2.1 && pwd && make build && make deploy bundle-base-images: @echo "=======================================" @echo "===== Building EpicMorg images =====" @echo "=======================================" - make ecosystem-astra-17se-images # make advanced-pyhton-images make ecosystem-debian-images @@ -1817,6 +1852,7 @@ bundle-jira: make ecosystem-jira-7-images make ecosystem-jira-8-images make ecosystem-jira-9-images + make ecosystem-jira-10images bundle-atlassian-latest: @echo "==============================================" diff --git a/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.jdk11 b/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.jdk11 index facd0525f..b2ce5fd3f 100644 --- a/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.jdk11 +++ b/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.jdk11 @@ -34,8 +34,8 @@ RUN mkdir -p ${BITBUCKET_INSTALL_DIR} && \ chown -R ${RUN_USER}:${RUN_GROUP} ${BITBUCKET_INSTALL_DIR} && \ sed -i -e 's/^# umask/umask/' ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.jdk17 b/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.jdk17 index 54ecc1611..80185bdb7 100644 --- a/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.jdk17 +++ b/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.jdk17 @@ -34,8 +34,8 @@ RUN mkdir -p ${BITBUCKET_INSTALL_DIR} && \ chown -R ${RUN_USER}:${RUN_GROUP} ${BITBUCKET_INSTALL_DIR} && \ sed -i -e 's/^# umask/umask/' ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.jdk8 b/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.jdk8 index b3ba1bfbd..f677f4ec5 100644 --- a/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.jdk8 +++ b/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.jdk8 @@ -34,8 +34,8 @@ RUN mkdir -p ${BITBUCKET_INSTALL_DIR} && \ chown -R ${RUN_USER}:${RUN_GROUP} ${BITBUCKET_INSTALL_DIR} && \ sed -i -e 's/^# umask/umask/' ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.legacy.jdk7 b/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.legacy.jdk7 index 884d077dd..6e4d5787f 100644 --- a/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.legacy.jdk7 +++ b/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.legacy.jdk7 @@ -35,8 +35,8 @@ RUN mkdir -p ${BITBUCKET_INSTALL_DIR} && \ chown -R ${RUN_USER}:${RUN_GROUP} ${BITBUCKET_INSTALL_DIR} && \ # sed -i -e 's/^# umask/umask/' ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.legacy.jdk8 b/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.legacy.jdk8 index f1a022d6a..93c0d51fc 100644 --- a/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.legacy.jdk8 +++ b/bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.legacy.jdk8 @@ -35,8 +35,8 @@ RUN mkdir -p ${BITBUCKET_INSTALL_DIR} && \ chown -R ${RUN_USER}:${RUN_GROUP} ${BITBUCKET_INSTALL_DIR} && \ # sed -i -e 's/^# umask/umask/' ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.1.jdk7.yml b/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.1.jdk7.yml index ea54c0c75..ef70340fd 100644 --- a/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.1.jdk7.yml +++ b/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.1.jdk7.yml @@ -15,21 +15,21 @@ force: true with_items: "{{ bitbucket_versions }}" -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: src: "template.stash.1.env.j2" dest: "{{ target_directory_bitbucket_1 }}/{{ item }}/.env" force: true with_items: "{{ bitbucket_versions }}" -- name: Copy docker-compose.yml from 'files' directory to each version directory +- name: Copy docker-compose.yml from template to each version directory copy: src: "docker-compose.jdk7.yml" dest: "{{ target_directory_bitbucket_1 }}/{{ item }}/docker-compose.yml" force: true with_items: "{{ bitbucket_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory +- name: Copy Dockerfile from template to each version directory copy: src: "Dockerfile.legacy.jdk7" dest: "{{ target_directory_bitbucket_1 }}/{{ item }}/Dockerfile" @@ -40,6 +40,7 @@ copy: src: "entrypoint.stash.sh" dest: "{{ target_directory_bitbucket_1 }}/{{ item }}/entrypoint.sh" + mode: "0777" force: true with_items: "{{ bitbucket_versions }}" diff --git a/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.2.jdk7.yml b/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.2.jdk7.yml index c78dd92d9..18cd69b50 100644 --- a/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.2.jdk7.yml +++ b/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.2.jdk7.yml @@ -15,21 +15,21 @@ force: true with_items: "{{ bitbucket_versions }}" -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: src: "template.stash.2.env.j2" dest: "{{ target_directory_bitbucket_2 }}/{{ item }}/.env" force: true with_items: "{{ bitbucket_versions }}" -- name: Copy docker-compose.yml from 'files' directory to each version directory +- name: Copy docker-compose.yml from template to each version directory copy: src: "docker-compose.jdk7.yml" dest: "{{ target_directory_bitbucket_2 }}/{{ item }}/docker-compose.yml" force: true with_items: "{{ bitbucket_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory +- name: Copy Dockerfile from template to each version directory copy: src: "Dockerfile.legacy.jdk7" dest: "{{ target_directory_bitbucket_2 }}/{{ item }}/Dockerfile" @@ -40,6 +40,7 @@ copy: src: "entrypoint.stash.sh" dest: "{{ target_directory_bitbucket_2 }}/{{ item }}/entrypoint.sh" + mode: "0777" force: true with_items: "{{ bitbucket_versions }}" diff --git a/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.3.jdk8.yml b/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.3.jdk8.yml index 5cb8be32e..c17972612 100644 --- a/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.3.jdk8.yml +++ b/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.3.jdk8.yml @@ -15,21 +15,21 @@ force: true with_items: "{{ bitbucket_versions }}" -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: src: "template.stash.3.env.j2" dest: "{{ target_directory_bitbucket_3 }}/{{ item }}/.env" force: true with_items: "{{ bitbucket_versions }}" -- name: Copy docker-compose.yml from 'files' directory to each version directory +- name: Copy docker-compose.yml from template to each version directory copy: src: "docker-compose.jdk8.yml" dest: "{{ target_directory_bitbucket_3 }}/{{ item }}/docker-compose.yml" force: true with_items: "{{ bitbucket_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory +- name: Copy Dockerfile from template to each version directory copy: src: "Dockerfile.legacy.jdk8" dest: "{{ target_directory_bitbucket_3 }}/{{ item }}/Dockerfile" @@ -40,6 +40,7 @@ copy: src: "entrypoint.stash.sh" dest: "{{ target_directory_bitbucket_3 }}/{{ item }}/entrypoint.sh" + mode: "0777" force: true with_items: "{{ bitbucket_versions }}" diff --git a/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.4.jdk8.yml b/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.4.jdk8.yml index 4f89cc41a..41f47fce5 100644 --- a/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.4.jdk8.yml +++ b/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.4.jdk8.yml @@ -15,21 +15,21 @@ force: true with_items: "{{ bitbucket_versions }}" -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: src: "template.bitbucket.4.env.j2" dest: "{{ target_directory_bitbucket_4 }}/{{ item }}/.env" force: true with_items: "{{ bitbucket_versions }}" -- name: Copy docker-compose.yml from 'files' directory to each version directory +- name: Copy docker-compose.yml from template to each version directory copy: src: "docker-compose.jdk8.yml" dest: "{{ target_directory_bitbucket_4 }}/{{ item }}/docker-compose.yml" force: true with_items: "{{ bitbucket_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory +- name: Copy Dockerfile from template to each version directory copy: src: "Dockerfile.legacy.jdk8" dest: "{{ target_directory_bitbucket_4 }}/{{ item }}/Dockerfile" @@ -40,6 +40,7 @@ copy: src: "entrypoint.sh" dest: "{{ target_directory_bitbucket_4 }}/{{ item }}/entrypoint.sh" + mode: "0777" force: true with_items: "{{ bitbucket_versions }}" diff --git a/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.jira.8.jdk8-11.yml b/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.jira.8.jdk8-11.yml index 058078e7a..f067c7fc6 100644 --- a/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.jira.8.jdk8-11.yml +++ b/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.jira.8.jdk8-11.yml @@ -15,21 +15,21 @@ force: true with_items: "{{ jira_versions }}" -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: src: "template.env.j2" dest: "{{ target_directory_jira_8 }}/{{ item }}/.env" force: true with_items: "{{ jira_versions }}" -- name: Copy docker-compose.yml from 'files' directory to each version directory +- name: Copy docker-compose.yml from template to each version directory copy: src: "docker-compose.yml" dest: "{{ target_directory_jira_8 }}/{{ item }}/docker-compose.yml" force: true with_items: "{{ jira_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory +- name: Copy Dockerfile from template to each version directory copy: src: "Dockerfile.jdk8" dest: "{{ target_directory_jira_8 }}/{{ item }}/Dockerfile" diff --git a/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.jira.8.jdk8.yml b/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.jira.8.jdk8.yml index 4fc5f2bd4..6d1206576 100644 --- a/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.jira.8.jdk8.yml +++ b/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.jira.8.jdk8.yml @@ -15,21 +15,21 @@ force: true with_items: "{{ jira_versions }}" -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: src: "template.env.j2" dest: "{{ target_directory_jira_8 }}/{{ item }}/.env" force: true with_items: "{{ jira_versions }}" -- name: Copy docker-compose.yml from 'files' directory to each version directory +- name: Copy docker-compose.yml from template to each version directory copy: src: "docker-compose.yml" dest: "{{ target_directory_jira_8 }}/{{ item }}/docker-compose.yml" force: true with_items: "{{ jira_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory +- name: Copy Dockerfile from template to each version directory copy: src: "Dockerfile.jdk8" dest: "{{ target_directory_jira_8 }}/{{ item }}/Dockerfile" diff --git a/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.jira.9.jdk8-11-17.yml b/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.jira.9.jdk8-11-17.yml index c6f6e4c48..76f87c633 100644 --- a/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.jira.9.jdk8-11-17.yml +++ b/bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.jira.9.jdk8-11-17.yml @@ -15,21 +15,21 @@ force: true with_items: "{{ jira_versions }}" -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: src: "template.env.j2" dest: "{{ target_directory_jira_9 }}/{{ item }}/.env" force: true with_items: "{{ jira_versions }}" -- name: Copy docker-compose.yml from 'files' directory to each version directory +- name: Copy docker-compose.yml from template to each version directory copy: src: "docker-compose.jdk8-11-17.yml" dest: "{{ target_directory_jira_9 }}/{{ item }}/docker-compose.yml" force: true with_items: "{{ jira_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory +- name: Copy Dockerfile from template to each version directory copy: src: "Dockerfile.jdk8" dest: "{{ target_directory_jira_9 }}/{{ item }}/Dockerfile" diff --git a/bin/ansible/roles/atlassian.jira/files/docker-compose.jdk6-7.yml b/bin/ansible/roles/atlassian.jira/files/docker-compose.jdk6-7.yml deleted file mode 100644 index 7bb35ba24..000000000 --- a/bin/ansible/roles/atlassian.jira/files/docker-compose.jdk6-7.yml +++ /dev/null @@ -1,17 +0,0 @@ -#version: '3.9' -services: - app: - image: "epicmorg/jira:${RELEASE}" - build: - context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} - app-jdk7: - image: "epicmorg/jira:${RELEASE}-jdk7" - build: - context: . - dockerfile: Dockerfile.jdk7 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/bin/ansible/roles/atlassian.jira/files/docker-compose.jdk7-8.yml b/bin/ansible/roles/atlassian.jira/files/docker-compose.jdk7-8.yml deleted file mode 100644 index ccadb73a7..000000000 --- a/bin/ansible/roles/atlassian.jira/files/docker-compose.jdk7-8.yml +++ /dev/null @@ -1,17 +0,0 @@ -#version: '3.9' -services: - app: - image: "epicmorg/jira:${RELEASE}" - build: - context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} - app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" - build: - context: . - dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/bin/ansible/roles/atlassian.jira/files/docker-compose.jdk8-11-17.yml b/bin/ansible/roles/atlassian.jira/files/docker-compose.jdk8-11-17.yml deleted file mode 100644 index 0669f016c..000000000 --- a/bin/ansible/roles/atlassian.jira/files/docker-compose.jdk8-11-17.yml +++ /dev/null @@ -1,25 +0,0 @@ -#version: '3.9' -services: - app: - image: "epicmorg/jira:${RELEASE}" - build: - context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} - app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" - build: - context: . - dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} - app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" - build: - context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/bin/ansible/roles/atlassian.jira/files/docker-compose.jdk8-11.yml b/bin/ansible/roles/atlassian.jira/files/docker-compose.jdk8-11.yml deleted file mode 100644 index 13ca91568..000000000 --- a/bin/ansible/roles/atlassian.jira/files/docker-compose.jdk8-11.yml +++ /dev/null @@ -1,17 +0,0 @@ -#version: '3.9' -services: - app: - image: "epicmorg/jira:${RELEASE}" - build: - context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} - app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" - build: - context: . - dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/bin/ansible/roles/atlassian.jira/files/docker-compose.yml b/bin/ansible/roles/atlassian.jira/files/docker-compose.yml deleted file mode 100644 index 4c6c5a54d..000000000 --- a/bin/ansible/roles/atlassian.jira/files/docker-compose.yml +++ /dev/null @@ -1,9 +0,0 @@ -#version: '3.9' -services: - app: - image: "epicmorg/jira:${RELEASE}" - build: - context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/bin/ansible/roles/atlassian.jira/files/entrypoint.sh b/bin/ansible/roles/atlassian.jira/files/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/bin/ansible/roles/atlassian.jira/files/entrypoint.sh +++ b/bin/ansible/roles/atlassian.jira/files/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/bin/ansible/roles/atlassian.jira/files/requirements.txt b/bin/ansible/roles/atlassian.jira/files/requirements.txt deleted file mode 100644 index 9ed771861..000000000 --- a/bin/ansible/roles/atlassian.jira/files/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -PyYAML -python-dotenv diff --git a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.10.jdk17.yml b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.10.jdk17.yml new file mode 100644 index 000000000..17b758195 --- /dev/null +++ b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.10.jdk17.yml @@ -0,0 +1,52 @@ +- name: Read versions from file + slurp: + src: "roles/common/files/versions/jira/10.jdk17.txt" + register: version_output + +- name: Set version variable + set_fact: + jira_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}" + +- name: Create directories for Jira versions + file: + path: "{{ target_directory_jira_10 }}/{{ item }}" + state: directory + mode: '0755' + force: true + with_items: "{{ jira_versions }}" + +- name: Copy .env with link from template to each version directory + template: + src: "env/template.env.j2" + dest: "{{ target_directory_jira_10 }}/{{ item }}/.env" + force: true + with_items: "{{ jira_versions }}" + +- name: Copy docker-compose.yml from template to each version directory + template: + src: "docker-compose/template.docker-compose.jdk17.yml.j2" + dest: "{{ target_directory_jira_10 }}/{{ item }}/docker-compose.yml" + force: true + with_items: "{{ jira_versions }}" + +- name: Copy Dockerfile from template to each version directory + template: + src: "dockerfile/template.Dockerfile.jdk17.j2" + dest: "{{ target_directory_jira_10 }}/{{ item }}/Dockerfile" + force: true + with_items: "{{ jira_versions }}" + +- name: Copy entrypoint.sh from 'files' directory to each version directory + copy: + src: "entrypoint.sh" + dest: "{{ target_directory_jira_10 }}/{{ item }}/entrypoint.sh" + mode: "0777" + force: true + with_items: "{{ jira_versions }}" + +- name: Copy Makefile from 'files' directory to each version directory + copy: + src: "Makefile" + dest: "{{ target_directory_jira_10 }}/{{ item }}/Makefile" + force: true + with_items: "{{ jira_versions }}" diff --git a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.4.jdk6.yml b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.4.jdk6.yml index eeb43064f..319f4d2bb 100644 --- a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.4.jdk6.yml +++ b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.4.jdk6.yml @@ -1,53 +1,54 @@ # Cant template urls because each versions have unical link. need to rework -- name: Read versions from file - slurp: - src: "roles/common/files/versions/jira/4.jdk6.txt" - register: version_output - -- name: Set version variable - set_fact: - jira_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}" - -- name: Create directories for Jira versions - file: - path: "{{ target_directory_jira_4 }}/{{ item }}" - state: directory - mode: '0755' - force: true - with_items: "{{ jira_versions }}" - -#- name: Copy template with link to each version directory -# template: -# src: "template.env.j2" -# dest: "{{ target_directory_jira_4 }}/{{ item }}/.env" -# force: true -# with_items: "{{ jira_versions }}" - -- name: Copy docker-compose.yml from 'files' directory to each version directory - copy: - src: "docker-compose.yml" - dest: "{{ target_directory_jira_4 }}/{{ item }}/docker-compose.yml" - force: true - with_items: "{{ jira_versions }}" - -- name: Copy Dockerfile from 'files' directory to each version directory - copy: - src: "Dockerfile.jdk6" - dest: "{{ target_directory_jira_4 }}/{{ item }}/Dockerfile" - force: true - with_items: "{{ jira_versions }}" - -- name: Copy entrypoint.sh from 'files' directory to each version directory - copy: - src: "entrypoint.sh" - dest: "{{ target_directory_jira_4 }}/{{ item }}/entrypoint.sh" - force: true - with_items: "{{ jira_versions }}" - -- name: Copy Makefile from 'files' directory to each version directory - copy: - src: "Makefile" - dest: "{{ target_directory_jira_4 }}/{{ item }}/Makefile" - force: true - with_items: "{{ jira_versions }}" +# - name: Read versions from file +# slurp: +# src: "roles/common/files/versions/jira/4.jdk6.txt" +# register: version_output +# +# - name: Set version variable +# set_fact: +# jira_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}" +# +# - name: Create directories for Jira versions +# file: +# path: "{{ target_directory_jira_4 }}/{{ item }}" +# state: directory +# mode: '0755' +# force: true +# with_items: "{{ jira_versions }}" +# +# #- name: Copy .env with link from template to each version directory +# # template: +# # src: "template.env.j2" +# # dest: "{{ target_directory_jira_4 }}/{{ item }}/.env" +# # force: true +# # with_items: "{{ jira_versions }}" +# +# - name: Copy docker-compose.yml from template to each version directory +# copy: +# src: "docker-compose.yml" +# dest: "{{ target_directory_jira_4 }}/{{ item }}/docker-compose.yml" +# force: true +# with_items: "{{ jira_versions }}" +# +# - name: Copy Dockerfile from template to each version directory +# copy: +# src: "Dockerfile.jdk6" +# dest: "{{ target_directory_jira_4 }}/{{ item }}/Dockerfile" +# force: true +# with_items: "{{ jira_versions }}" +# +# - name: Copy entrypoint.sh from 'files' directory to each version directory +# copy: +# src: "entrypoint.sh" +# dest: "{{ target_directory_jira_4 }}/{{ item }}/entrypoint.sh" + mode: "0777" +# force: true +# with_items: "{{ jira_versions }}" +# +# - name: Copy Makefile from 'files' directory to each version directory +# copy: +# src: "Makefile" +# dest: "{{ target_directory_jira_4 }}/{{ item }}/Makefile" +# force: true +# with_items: "{{ jira_versions }}" diff --git a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.5.jdk6-7.yml b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.5.jdk6-7.yml index 722aaa207..8cfaf84fd 100644 --- a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.5.jdk6-7.yml +++ b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.5.jdk6-7.yml @@ -15,30 +15,30 @@ force: true with_items: "{{ jira_versions }}" -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: - src: "template.env.legacy.j2" + src: "env/template.env.legacy.j2" dest: "{{ target_directory_jira_5 }}/{{ item }}/.env" force: true with_items: "{{ jira_versions }}" -- name: Copy docker-compose.yml from 'files' directory to each version directory - copy: - src: "docker-compose.jdk6-7.yml" +- name: Copy docker-compose.yml from template to each version directory + template: + src: "docker-compose/template.docker-compose.jdk6-7.yml.j2" dest: "{{ target_directory_jira_5 }}/{{ item }}/docker-compose.yml" force: true with_items: "{{ jira_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory - copy: - src: "Dockerfile.jdk6" +- name: Copy Dockerfile from template to each version directory + template: + src: "dockerfile/template.Dockerfile.jdk6.j2" dest: "{{ target_directory_jira_5 }}/{{ item }}/Dockerfile" force: true with_items: "{{ jira_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory - copy: - src: "Dockerfile.jdk7" +- name: Copy Dockerfile from template to each version directory + template: + src: "dockerfile/template.Dockerfile.jdk7.j2" dest: "{{ target_directory_jira_5 }}/{{ item }}/Dockerfile.jdk7" force: true with_items: "{{ jira_versions }}" @@ -47,6 +47,7 @@ copy: src: "entrypoint.sh" dest: "{{ target_directory_jira_5 }}/{{ item }}/entrypoint.sh" + mode: "0777" force: true with_items: "{{ jira_versions }}" diff --git a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.5.jdk6.yml b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.5.jdk6.yml index 4a28a2c4e..fcde4a2d1 100644 --- a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.5.jdk6.yml +++ b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.5.jdk6.yml @@ -15,23 +15,23 @@ force: true with_items: "{{ jira_versions }}" -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: - src: "template.env.legacy.j2" + src: "env/template.env.legacy.j2" dest: "{{ target_directory_jira_5 }}/{{ item }}/.env" force: true with_items: "{{ jira_versions }}" -- name: Copy docker-compose.yml from 'files' directory to each version directory - copy: - src: "docker-compose.yml" +- name: Copy docker-compose.yml from template to each version directory + template: + src: "docker-compose/template.docker-compose.jdk6.yml.j2" dest: "{{ target_directory_jira_5 }}/{{ item }}/docker-compose.yml" force: true with_items: "{{ jira_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory - copy: - src: "Dockerfile.jdk6" +- name: Copy Dockerfile from template to each version directory + template: + src: "dockerfile/template.Dockerfile.jdk6.j2" dest: "{{ target_directory_jira_5 }}/{{ item }}/Dockerfile" force: true with_items: "{{ jira_versions }}" @@ -40,6 +40,7 @@ copy: src: "entrypoint.sh" dest: "{{ target_directory_jira_5 }}/{{ item }}/entrypoint.sh" + mode: "0777" force: true with_items: "{{ jira_versions }}" diff --git a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.6.jdk7-8.yml b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.6.jdk7-8.yml index e9dc9f93a..5a3d3df7e 100644 --- a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.6.jdk7-8.yml +++ b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.6.jdk7-8.yml @@ -15,30 +15,30 @@ force: true with_items: "{{ jira_versions }}" -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: - src: "template.env.legacy.j2" + src: "env/template.env.legacy.j2" dest: "{{ target_directory_jira_6 }}/{{ item }}/.env" force: true with_items: "{{ jira_versions }}" -- name: Copy docker-compose.yml from 'files' directory to each version directory - copy: - src: "docker-compose.jdk7-8.yml" +- name: Copy docker-compose.yml from template to each version directory + template: + src: "docker-compose/template.docker-compose.jdk7-8.yml.j2" dest: "{{ target_directory_jira_6 }}/{{ item }}/docker-compose.yml" force: true with_items: "{{ jira_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory - copy: - src: "Dockerfile.jdk7" +- name: Copy Dockerfile from template to each version directory + template: + src: "dockerfile/template.Dockerfile.jdk7.j2" dest: "{{ target_directory_jira_6 }}/{{ item }}/Dockerfile" force: true with_items: "{{ jira_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory - copy: - src: "Dockerfile.jdk7-8" +- name: Copy Dockerfile from template to each version directory + template: + src: "dockerfile/template.Dockerfile.jdk8-legacy.j2" dest: "{{ target_directory_jira_6 }}/{{ item }}/Dockerfile.jdk8" force: true with_items: "{{ jira_versions }}" @@ -47,6 +47,7 @@ copy: src: "entrypoint.sh" dest: "{{ target_directory_jira_6 }}/{{ item }}/entrypoint.sh" + mode: "0777" force: true with_items: "{{ jira_versions }}" diff --git a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.6.jdk7.yml b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.6.jdk7.yml index ac061ec9a..b6cb3462e 100644 --- a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.6.jdk7.yml +++ b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.6.jdk7.yml @@ -15,23 +15,23 @@ force: true with_items: "{{ jira_versions }}" -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: - src: "template.env.legacy.j2" + src: "env/template.env.legacy.j2" dest: "{{ target_directory_jira_6 }}/{{ item }}/.env" force: true with_items: "{{ jira_versions }}" -- name: Copy docker-compose.yml from 'files' directory to each version directory - copy: - src: "docker-compose.yml" +- name: Copy docker-compose.yml from template to each version directory + template: + src: "docker-compose/template.docker-compose.jdk7.yml.j2" dest: "{{ target_directory_jira_6 }}/{{ item }}/docker-compose.yml" force: true with_items: "{{ jira_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory - copy: - src: "Dockerfile.jdk7" +- name: Copy Dockerfile from template to each version directory + template: + src: "dockerfile/template.Dockerfile.jdk7.j2" dest: "{{ target_directory_jira_6 }}/{{ item }}/Dockerfile" force: true with_items: "{{ jira_versions }}" @@ -40,6 +40,7 @@ copy: src: "entrypoint.sh" dest: "{{ target_directory_jira_6 }}/{{ item }}/entrypoint.sh" + mode: "0777" force: true with_items: "{{ jira_versions }}" diff --git a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.7.jdk8p1.yml b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.7.jdk8p1.yml index 3f46da7ff..ccce4691a 100644 --- a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.7.jdk8p1.yml +++ b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.7.jdk8p1.yml @@ -15,23 +15,23 @@ force: true with_items: "{{ jira_versions }}" -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: - src: "template.env.legacy2software.j2" + src: "env/template.env.legacy2software.j2" dest: "{{ target_directory_jira_7 }}/{{ item }}/.env" force: true with_items: "{{ jira_versions }}" -- name: Copy docker-compose.yml from 'files' directory to each version directory - copy: - src: "docker-compose.yml" +- name: Copy docker-compose.yml from template to each version directory + template: + src: "docker-compose/template.docker-compose.jdk8.yml.j2" dest: "{{ target_directory_jira_7 }}/{{ item }}/docker-compose.yml" force: true with_items: "{{ jira_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory - copy: - src: "Dockerfile.jdk8" +- name: Copy Dockerfile from template to each version directory + template: + src: "dockerfile/template.Dockerfile.jdk8-legacy2software.j2" dest: "{{ target_directory_jira_7 }}/{{ item }}/Dockerfile" force: true with_items: "{{ jira_versions }}" @@ -40,6 +40,7 @@ copy: src: "entrypoint.sh" dest: "{{ target_directory_jira_7 }}/{{ item }}/entrypoint.sh" + mode: "0777" force: true with_items: "{{ jira_versions }}" diff --git a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.7.jdk8p2.yml b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.7.jdk8p2.yml index 5f4c8e7ef..bc7207935 100644 --- a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.7.jdk8p2.yml +++ b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.7.jdk8p2.yml @@ -15,23 +15,23 @@ force: true with_items: "{{ jira_versions }}" -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: - src: "template.env.j2" + src: "env/template.env.j2" dest: "{{ target_directory_jira_7 }}/{{ item }}/.env" force: true with_items: "{{ jira_versions }}" -- name: Copy docker-compose.yml from 'files' directory to each version directory - copy: - src: "docker-compose.yml" +- name: Copy docker-compose.yml from template to each version directory + template: + src: "docker-compose/template.docker-compose.jdk8.yml.j2" dest: "{{ target_directory_jira_7 }}/{{ item }}/docker-compose.yml" force: true with_items: "{{ jira_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory - copy: - src: "Dockerfile.jdk8" +- name: Copy Dockerfile from template to each version directory + template: + src: "dockerfile/template.Dockerfile.jdk8.j2" dest: "{{ target_directory_jira_7 }}/{{ item }}/Dockerfile" force: true with_items: "{{ jira_versions }}" @@ -40,6 +40,7 @@ copy: src: "entrypoint.sh" dest: "{{ target_directory_jira_7 }}/{{ item }}/entrypoint.sh" + mode: "0777" force: true with_items: "{{ jira_versions }}" diff --git a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.8.jdk8-11.yml b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.8.jdk8-11.yml index 058078e7a..43e826c24 100644 --- a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.8.jdk8-11.yml +++ b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.8.jdk8-11.yml @@ -15,30 +15,30 @@ force: true with_items: "{{ jira_versions }}" -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: - src: "template.env.j2" + src: "env/template.env.j2" dest: "{{ target_directory_jira_8 }}/{{ item }}/.env" force: true with_items: "{{ jira_versions }}" -- name: Copy docker-compose.yml from 'files' directory to each version directory - copy: - src: "docker-compose.yml" +- name: Copy docker-compose.yml from template to each version directory + template: + src: "docker-compose/template.docker-compose.jdk8-11.yml.j2" dest: "{{ target_directory_jira_8 }}/{{ item }}/docker-compose.yml" force: true with_items: "{{ jira_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory - copy: - src: "Dockerfile.jdk8" +- name: Copy Dockerfile from template to each version directory + template: + src: "dockerfile/template.Dockerfile.jdk8.j2" dest: "{{ target_directory_jira_8 }}/{{ item }}/Dockerfile" force: true with_items: "{{ jira_versions }}" - name: Copy Dockerfile.jdk11 from 'files' directory to each version directory - copy: - src: "Dockerfile.jdk11" + template: + src: "dockerfile/template.Dockerfile.jdk11.j2" dest: "{{ target_directory_jira_8 }}/{{ item }}/Dockerfile.jdk11" force: true with_items: "{{ jira_versions }}" @@ -47,6 +47,7 @@ copy: src: "entrypoint.sh" dest: "{{ target_directory_jira_8 }}/{{ item }}/entrypoint.sh" + mode: "0777" force: true with_items: "{{ jira_versions }}" diff --git a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.8.jdk8.yml b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.8.jdk8.yml index 4fc5f2bd4..cab7c0483 100644 --- a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.8.jdk8.yml +++ b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.8.jdk8.yml @@ -15,23 +15,23 @@ force: true with_items: "{{ jira_versions }}" -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: - src: "template.env.j2" + src: "env/template.env.j2" dest: "{{ target_directory_jira_8 }}/{{ item }}/.env" force: true with_items: "{{ jira_versions }}" -- name: Copy docker-compose.yml from 'files' directory to each version directory - copy: - src: "docker-compose.yml" +- name: Copy docker-compose.yml from template to each version directory + template: + src: "docker-compose/template.docker-compose.jdk8.yml.j2" dest: "{{ target_directory_jira_8 }}/{{ item }}/docker-compose.yml" force: true with_items: "{{ jira_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory - copy: - src: "Dockerfile.jdk8" +- name: Copy Dockerfile from template to each version directory + template: + src: "dockerfile/template.Dockerfile.jdk8.j2" dest: "{{ target_directory_jira_8 }}/{{ item }}/Dockerfile" force: true with_items: "{{ jira_versions }}" @@ -40,6 +40,7 @@ copy: src: "entrypoint.sh" dest: "{{ target_directory_jira_8 }}/{{ item }}/entrypoint.sh" + mode: "0777" force: true with_items: "{{ jira_versions }}" diff --git a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.9.jdk8-11-17.yml b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.9.jdk8-11-17.yml index c6f6e4c48..2e97b8825 100644 --- a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.9.jdk8-11-17.yml +++ b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.9.jdk8-11-17.yml @@ -15,37 +15,37 @@ force: true with_items: "{{ jira_versions }}" -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: - src: "template.env.j2" + src: "env/template.env.j2" dest: "{{ target_directory_jira_9 }}/{{ item }}/.env" force: true with_items: "{{ jira_versions }}" -- name: Copy docker-compose.yml from 'files' directory to each version directory - copy: - src: "docker-compose.jdk8-11-17.yml" +- name: Copy docker-compose.yml from template to each version directory + template: + src: "docker-compose/template.docker-compose.jdk8-11-17.yml.j2" dest: "{{ target_directory_jira_9 }}/{{ item }}/docker-compose.yml" force: true with_items: "{{ jira_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory - copy: - src: "Dockerfile.jdk8" +- name: Copy Dockerfile from template to each version directory + template: + src: "dockerfile/template.Dockerfile.jdk8.j2" dest: "{{ target_directory_jira_9 }}/{{ item }}/Dockerfile" force: true with_items: "{{ jira_versions }}" - name: Copy Dockerfile.jdk11 from 'files' directory to each version directory - copy: - src: "Dockerfile.jdk11" + template: + src: "dockerfile/template.Dockerfile.jdk11.j2" dest: "{{ target_directory_jira_9 }}/{{ item }}/Dockerfile.jdk11" force: true with_items: "{{ jira_versions }}" - name: Copy Dockerfile.jdk17 from 'files' directory to each version directory - copy: - src: "Dockerfile.jdk17" + template: + src: "dockerfile/template.Dockerfile.jdk17.j2" dest: "{{ target_directory_jira_9 }}/{{ item }}/Dockerfile.jdk17" force: true with_items: "{{ jira_versions }}" @@ -54,6 +54,7 @@ copy: src: "entrypoint.sh" dest: "{{ target_directory_jira_9 }}/{{ item }}/entrypoint.sh" + mode: "0777" force: true with_items: "{{ jira_versions }}" diff --git a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.9.jdk8-11.yml b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.9.jdk8-11.yml index c622d4360..9c82dfbc2 100644 --- a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.9.jdk8-11.yml +++ b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.9.jdk8-11.yml @@ -15,30 +15,30 @@ force: true with_items: "{{ jira_versions }}" -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: - src: "template.env.j2" + src: "env/template.env.j2" dest: "{{ target_directory_jira_9 }}/{{ item }}/.env" force: true with_items: "{{ jira_versions }}" -- name: Copy docker-compose.yml from 'files' directory to each version directory - copy: - src: "docker-compose.jdk8-11.yml" +- name: Copy docker-compose.yml from template to each version directory + template: + src: "docker-compose/template.docker-compose.jdk8-11.yml.j2" dest: "{{ target_directory_jira_9 }}/{{ item }}/docker-compose.yml" force: true with_items: "{{ jira_versions }}" -- name: Copy Dockerfile from 'files' directory to each version directory - copy: - src: "Dockerfile.jdk8" +- name: Copy Dockerfile from template to each version directory + template: + src: "dockerfile/template.Dockerfile.jdk8.j2" dest: "{{ target_directory_jira_9 }}/{{ item }}/Dockerfile" force: true with_items: "{{ jira_versions }}" - name: Copy Dockerfile.jdk11 from 'files' directory to each version directory - copy: - src: "Dockerfile.jdk11" + template: + src: "dockerfile/template.Dockerfile.jdk11.j2" dest: "{{ target_directory_jira_9 }}/{{ item }}/Dockerfile.jdk11" force: true with_items: "{{ jira_versions }}" @@ -47,6 +47,7 @@ copy: src: "entrypoint.sh" dest: "{{ target_directory_jira_9 }}/{{ item }}/entrypoint.sh" + mode: "0777" force: true with_items: "{{ jira_versions }}" diff --git a/bin/ansible/roles/atlassian.jira/tasks/main.yml b/bin/ansible/roles/atlassian.jira/tasks/main.yml index 6b507c3c4..26c85d802 100644 --- a/bin/ansible/roles/atlassian.jira/tasks/main.yml +++ b/bin/ansible/roles/atlassian.jira/tasks/main.yml @@ -1,6 +1,6 @@ # broken envs, generating without it -- name: "Generate images for Jira 4 (jdk6)" - import_tasks: atlassian.jira.4.jdk6.yml +#- name: "Generate images for Jira 4 (jdk6)" +# import_tasks: atlassian.jira.4.jdk6.yml - name: "Generate images for Jira 5.0-5.1 (jdk6)" import_tasks: atlassian.jira.5.jdk6.yml @@ -31,3 +31,6 @@ - name: "Generate images for Jira 9.5+ (jdk8, jdk11, jdk17)" import_tasks: atlassian.jira.9.jdk8-11-17.yml + +- name: "Generate images for Jira 10+ (jdk17)" + import_tasks: atlassian.jira.10.jdk17.yml diff --git a/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk17.yml.j2 b/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk17.yml.j2 new file mode 100644 index 000000000..cb88da0f0 --- /dev/null +++ b/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk17.yml.j2 @@ -0,0 +1,10 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:{{ item }}" + build: + context: . + app-jdk17: + image: "epicmorg/jira:{{ item }}-jdk17" + build: + context: . \ No newline at end of file diff --git a/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk6-7.yml.j2 b/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk6-7.yml.j2 new file mode 100644 index 000000000..fc788c491 --- /dev/null +++ b/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk6-7.yml.j2 @@ -0,0 +1,15 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:{{ item }}" + build: + context: . + app-jdk6: + image: "epicmorg/jira:{{ item }}-jdk6" + build: + context: . + app-jdk7: + image: "epicmorg/jira:{{ item }}-jdk7" + build: + context: . + dockerfile: Dockerfile.jdk7 diff --git a/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk6.yml.j2 b/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk6.yml.j2 new file mode 100644 index 000000000..7c0712a62 --- /dev/null +++ b/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk6.yml.j2 @@ -0,0 +1,10 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:{{ item }}" + build: + context: . + app-jdk6: + image: "epicmorg/jira:{{ item }}-jdk6" + build: + context: . diff --git a/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk7-8.yml.j2 b/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk7-8.yml.j2 new file mode 100644 index 000000000..62547b6af --- /dev/null +++ b/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk7-8.yml.j2 @@ -0,0 +1,15 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:{{ item }}" + build: + context: . + app-jdk7: + image: "epicmorg/jira:{{ item }}-jdk7" + build: + context: . + app-jdk8: + image: "epicmorg/jira:{{ item }}-jdk8" + build: + context: . + dockerfile: Dockerfile.jdk8 diff --git a/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk7.yml.j2 b/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk7.yml.j2 new file mode 100644 index 000000000..e72251d13 --- /dev/null +++ b/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk7.yml.j2 @@ -0,0 +1,10 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:{{ item }}" + build: + context: . + app-jdk7: + image: "epicmorg/jira:{{ item }}-jdk7" + build: + context: . diff --git a/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk8-11-17.yml.j2 b/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk8-11-17.yml.j2 new file mode 100644 index 000000000..19485a51b --- /dev/null +++ b/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk8-11-17.yml.j2 @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:{{ item }}" + build: + context: . + app-jdk8: + image: "epicmorg/jira:{{ item }}-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:{{ item }}-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:{{ item }}-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk8-11.yml.j2 b/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk8-11.yml.j2 new file mode 100644 index 000000000..accdeba7e --- /dev/null +++ b/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk8-11.yml.j2 @@ -0,0 +1,15 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:{{ item }}" + build: + context: . + app-jdk8: + image: "epicmorg/jira:{{ item }}-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:{{ item }}-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk8.yml.j2 b/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk8.yml.j2 new file mode 100644 index 000000000..c6937be1e --- /dev/null +++ b/bin/ansible/roles/atlassian.jira/templates/docker-compose/template.docker-compose.jdk8.yml.j2 @@ -0,0 +1,10 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:{{ item }}" + build: + context: . + app-jdk8: + image: "epicmorg/jira:{{ item }}-jdk8" + build: + context: . diff --git a/bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk11.j2 b/bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk11.j2 new file mode 100644 index 000000000..2272c56bf --- /dev/null +++ b/bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk11.j2 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE={{ item }} +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk17.j2 b/bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk17.j2 new file mode 100644 index 000000000..bfc945df8 --- /dev/null +++ b/bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk17.j2 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE={{ item }} +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk6 b/bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk6.j2 similarity index 58% rename from bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk6 rename to bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk6.j2 index b59e86954..b53bc3684 100644 --- a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk6 +++ b/bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk6.j2 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE={{ item }} +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk7 b/bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk7.j2 similarity index 58% rename from bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk7 rename to bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk7.j2 index 41a2e1710..1d3724f9a 100644 --- a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk7 +++ b/bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk7.j2 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE={{ item }} +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk7-8 b/bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk8-legacy.j2 similarity index 58% rename from bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk7-8 rename to bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk8-legacy.j2 index 72eb6178e..f3e7ff082 100644 --- a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk7-8 +++ b/bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk8-legacy.j2 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE={{ item }} +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk8 b/bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk8-legacy2software.j2 similarity index 56% rename from bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk8 rename to bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk8-legacy2software.j2 index d3d23294c..f9b8c0031 100644 --- a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk8 +++ b/bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk8-legacy2software.j2 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE={{ item }} +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk8.j2 b/bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk8.j2 new file mode 100644 index 000000000..c8b5bf80c --- /dev/null +++ b/bin/ansible/roles/atlassian.jira/templates/dockerfile/template.Dockerfile.jdk8.j2 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE={{ item }} +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/bin/ansible/roles/atlassian.jira/templates/template.env.j2 b/bin/ansible/roles/atlassian.jira/templates/env/template.env.j2 similarity index 100% rename from bin/ansible/roles/atlassian.jira/templates/template.env.j2 rename to bin/ansible/roles/atlassian.jira/templates/env/template.env.j2 diff --git a/bin/ansible/roles/atlassian.jira/templates/template.env.legacy.j2 b/bin/ansible/roles/atlassian.jira/templates/env/template.env.legacy.j2 similarity index 100% rename from bin/ansible/roles/atlassian.jira/templates/template.env.legacy.j2 rename to bin/ansible/roles/atlassian.jira/templates/env/template.env.legacy.j2 diff --git a/bin/ansible/roles/atlassian.jira/templates/template.env.legacy2software.j2 b/bin/ansible/roles/atlassian.jira/templates/env/template.env.legacy2software.j2 similarity index 100% rename from bin/ansible/roles/atlassian.jira/templates/template.env.legacy2software.j2 rename to bin/ansible/roles/atlassian.jira/templates/env/template.env.legacy2software.j2 diff --git a/bin/ansible/roles/atlassian.jira/vars/main.yml b/bin/ansible/roles/atlassian.jira/vars/main.yml index cd14b3e53..a7a746199 100644 --- a/bin/ansible/roles/atlassian.jira/vars/main.yml +++ b/bin/ansible/roles/atlassian.jira/vars/main.yml @@ -5,3 +5,4 @@ target_directory_jira_6: "/opt/tmp/jira/6" target_directory_jira_7: "/opt/tmp/jira/7" target_directory_jira_8: "/opt/tmp/jira/8" target_directory_jira_9: "/opt/tmp/jira/9" +target_directory_jira_10: "/opt/tmp/jira/10" diff --git a/bin/ansible/roles/common/files/versions/jira/10.jdk17.txt b/bin/ansible/roles/common/files/versions/jira/10.jdk17.txt new file mode 100644 index 000000000..e17e9018e --- /dev/null +++ b/bin/ansible/roles/common/files/versions/jira/10.jdk17.txt @@ -0,0 +1,6 @@ +10.0.0 +10.0.1 +10.1.1 +10.1.2 +10.2.0 +10.2.1 diff --git a/bin/ansible/roles/common/files/versions/jira/9.jdk8-11-17.txt b/bin/ansible/roles/common/files/versions/jira/9.jdk8-11-17.txt index 33ee91eaa..8bcf9e639 100644 --- a/bin/ansible/roles/common/files/versions/jira/9.jdk8-11-17.txt +++ b/bin/ansible/roles/common/files/versions/jira/9.jdk8-11-17.txt @@ -20,3 +20,29 @@ 9.12.0 9.12.1 9.12.2 +9.12.3 +9.12.4 +9.12.5 +9.12.6 +9.12.7 +9.12.8 +9.12.9 +9.12.10 +9.12.11 +9.12.12 +9.12.13 +9.12.14 +9.12.15 +9.13.0 +9.13.1 +9.14.0 +9.14.1 +9.15.2 +9.16.0 +9.16.1 +9.17.0 +9.17.1 +9.17.2 +9.17.3 +9.17.4 +9.17.5 diff --git a/bin/ansible/roles/common/files/versions/jira/9.jdk8-11.txt b/bin/ansible/roles/common/files/versions/jira/9.jdk8-11.txt index 1aa88ca64..083a03b79 100644 --- a/bin/ansible/roles/common/files/versions/jira/9.jdk8-11.txt +++ b/bin/ansible/roles/common/files/versions/jira/9.jdk8-11.txt @@ -22,4 +22,16 @@ 9.4.12 9.4.14 9.4.15 -9.4.15 +9.4.16 +9.4.17 +9.4.18 +9.4.19 +9.4.20 +9.4.21 +9.4.22 +9.4.23 +9.4.24 +9.4.25 +9.4.26 +9.4.27 +9.4.28 \ No newline at end of file diff --git a/bin/ansible/roles/gurock.testrail/tasks/testrail.php70.yml b/bin/ansible/roles/gurock.testrail/tasks/testrail.php70.yml index fda391a03..d87b7ee6d 100644 --- a/bin/ansible/roles/gurock.testrail/tasks/testrail.php70.yml +++ b/bin/ansible/roles/gurock.testrail/tasks/testrail.php70.yml @@ -21,7 +21,7 @@ with_items: "{{ testrail_versions }}" # no_log: true -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: src: "template.env.php70.j2" dest: "{{ target_directory }}/{{ item }}/main/.env" diff --git a/bin/ansible/roles/gurock.testrail/tasks/testrail.php71.yml b/bin/ansible/roles/gurock.testrail/tasks/testrail.php71.yml index 5501afef6..5793a279f 100644 --- a/bin/ansible/roles/gurock.testrail/tasks/testrail.php71.yml +++ b/bin/ansible/roles/gurock.testrail/tasks/testrail.php71.yml @@ -21,7 +21,7 @@ with_items: "{{ testrail_versions }}" # no_log: true -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: src: "template.env.php71.j2" dest: "{{ target_directory }}/{{ item }}/main/.env" diff --git a/bin/ansible/roles/gurock.testrail/tasks/testrail.php72.yml b/bin/ansible/roles/gurock.testrail/tasks/testrail.php72.yml index 02744a9ea..1566a303c 100644 --- a/bin/ansible/roles/gurock.testrail/tasks/testrail.php72.yml +++ b/bin/ansible/roles/gurock.testrail/tasks/testrail.php72.yml @@ -21,7 +21,7 @@ with_items: "{{ testrail_versions }}" # no_log: true -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: src: "template.env.php72.j2" dest: "{{ target_directory }}/{{ item }}/main/.env" diff --git a/bin/ansible/roles/gurock.testrail/tasks/testrail.php74.yml b/bin/ansible/roles/gurock.testrail/tasks/testrail.php74.yml index e9a930e2c..11cb7defb 100644 --- a/bin/ansible/roles/gurock.testrail/tasks/testrail.php74.yml +++ b/bin/ansible/roles/gurock.testrail/tasks/testrail.php74.yml @@ -21,7 +21,7 @@ with_items: "{{ testrail_versions }}" # no_log: true -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: src: "template.env.php72.j2" dest: "{{ target_directory }}/{{ item }}/main/.env" diff --git a/bin/ansible/roles/gurock.testrail/tasks/testrail.php81.yml b/bin/ansible/roles/gurock.testrail/tasks/testrail.php81.yml index 3776b02a2..5abbc4a6c 100644 --- a/bin/ansible/roles/gurock.testrail/tasks/testrail.php81.yml +++ b/bin/ansible/roles/gurock.testrail/tasks/testrail.php81.yml @@ -21,7 +21,7 @@ with_items: "{{ testrail_versions }}" # no_log: true -- name: Copy template with link to each version directory +- name: Copy .env with link from template to each version directory template: src: "template.env.php81.j2" dest: "{{ target_directory }}/{{ item }}/main/.env" diff --git a/bin/dotnet/EpicMorg.DockerGenerator.csproj b/bin/dotnet/EpicMorg.DockerGenerator.csproj deleted file mode 100644 index 0bb737852..000000000 --- a/bin/dotnet/EpicMorg.DockerGenerator.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - Exe - net6.0 - - - - - diff --git a/bin/dotnet/Program.cs b/bin/dotnet/Program.cs deleted file mode 100644 index bd244f993..000000000 --- a/bin/dotnet/Program.cs +++ /dev/null @@ -1,96 +0,0 @@ -namespace Epicmorg.DockerGenerator -{ - using System; - using System.IO; - using System.Linq; - using System.Runtime.InteropServices; - using System.Text.Json; - using System.Threading.Tasks; - - class Program - { - /// - /// EpicMorg docker build script generator - /// - /// Working directory - /// Atlassian product JSON - /// Product name - /// Overwrite existing directories - /// Overwrite archive type - /// Silently ignore versions without templates - /// - public static async Task Main(DirectoryInfo workdir, FileInfo json, string product, bool force = false, bool ignoreVersionsWithoutTemplates = false,string archiveType = ".tar.gz") - { - var jsonData = File.ReadAllText(json.FullName)["downloads(".Length..^1]; - var items = JsonSerializer.Deserialize(jsonData, new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); - foreach (var item in items.Where(a=>a.ZipUrl != null && a.ZipUrl.ToString().EndsWith(archiveType) && !a.ZipUrl .ToString().Contains("-war"))) - { - var majorVersion = item.Version.Split(".").First(); - var templatePath = Path.Combine(workdir.FullName, product, "templates", majorVersion); - if (!Directory.Exists(templatePath)) - { - if (!ignoreVersionsWithoutTemplates) - { - Console.Error.WriteLine("Failed to find template for the major version {0}. Exiting", majorVersion); - return; - } - else - { - Console.Error.WriteLine("Failed to find template for the major version {0}. Skipping", majorVersion); - continue; - } - } - - var localPath = Path.Combine(product, majorVersion, item.Version); - var outputPath = Path.Combine(workdir.FullName, localPath); - if (Directory.Exists(outputPath)) - { - if (!force) - { - Console.Error.WriteLine("Directory '{0}' already exists, skipping", localPath); - continue; - } - else - { - Console.Error.WriteLine("Directory '{0}' already exists, overwriting", localPath); - Directory.Delete(outputPath, true); - } - } - Directory.CreateDirectory(outputPath); - CopyFilesRecursively(new DirectoryInfo(templatePath), new DirectoryInfo(outputPath)); - File.WriteAllText( - Path.Combine(outputPath, ".env"), - @$" -RELEASE={item.Version} -DOWNLOAD_URL={item.ZipUrl} -" - ); - } - - } - - private static void CopyFilesRecursively(DirectoryInfo source, DirectoryInfo target) - { - foreach (DirectoryInfo dir in source.GetDirectories()) - CopyFilesRecursively(dir, target.CreateSubdirectory(dir.Name)); - foreach (FileInfo file in source.GetFiles()) - file.CopyTo(Path.Combine(target.FullName, file.Name)); - } - - public partial class ResponseItem - { - public string Description { get; set; } - public string Edition { get; set; } - public Uri ZipUrl { get; set; } - public string TarUrl { get; set; } - public string Md5 { get; set; } - public string Size { get; set; } - public string Released { get; set; } - public string Type { get; set; } - public string Platform { get; set; } - public string Version { get; set; } - public Uri ReleaseNotes { get; set; } - public Uri UpgradeNotes { get; set; } - } - } -} diff --git a/bin/dotnet/README.md b/bin/dotnet/README.md deleted file mode 100644 index 1c5f134a0..000000000 --- a/bin/dotnet/README.md +++ /dev/null @@ -1,14 +0,0 @@ -## How to Update jira v8 example - -``` -Epicmorg.DockerGenerator.exe - --workdir "\docker-scripts\linux\atlassian\" - --json "\atlassian-json\json-backups\archived\jira-software.json" \\ - --product "jira" - --ignore-versions-without-templates -``` - -## inline -``` -Epicmorg.DockerGenerator.exe --workdir "D:\Work\GitHub\EpicMorg\Main\docker-scripts\linux\atlassian\" --json "D:\Work\GitHub\EpicMorg\Main\atlassian-json\json-backups\archived\jira-software.json" --product "jira" --ignore-versions-without-templates -``` \ No newline at end of file diff --git a/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile b/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile index 4d5aa881e..10f8e2563 100644 --- a/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile +++ b/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile @@ -5,8 +5,8 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG BITBUCKET_VERSION=8.17.0 -ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz +ARG RELEASE=8.17.0 +ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${RELEASE}.tar.gz ################################################################## # Setup diff --git a/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile.jdk11 index 176df8166..b948565aa 100644 --- a/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile.jdk11 @@ -5,8 +5,8 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG BITBUCKET_VERSION=8.17.0 -ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz +ARG RELEASE=8.17.0 +ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${RELEASE}.tar.gz ################################################################## # Setup diff --git a/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile.jdk17 b/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile.jdk17 index 561ba668c..9c3a9ed6b 100644 --- a/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile.jdk17 @@ -5,8 +5,8 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG BITBUCKET_VERSION=8.17.0 -ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz +ARG RELEASE=8.17.0 +ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${RELEASE}.tar.gz ################################################################## # Setup diff --git a/linux/ecosystem/atlassian/confluence/latest/Dockerfile b/linux/ecosystem/atlassian/confluence/latest/Dockerfile index 758e6b49c..6d7480d82 100644 --- a/linux/ecosystem/atlassian/confluence/latest/Dockerfile +++ b/linux/ecosystem/atlassian/confluence/latest/Dockerfile @@ -5,8 +5,8 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=8.7.2 -ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz +ARG RELEASE=8.7.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${RELEASE}.tar.gz ################################################################## # Setup diff --git a/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk11 b/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk11 index 602245aeb..475efa583 100644 --- a/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk11 @@ -5,8 +5,8 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=8.7.2 -ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz +ARG RELEASE=8.7.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${RELEASE}.tar.gz ################################################################## # Setup diff --git a/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk17 b/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk17 index 861a4bd79..03d29bce7 100644 --- a/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk17 @@ -5,8 +5,8 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=8.7.2 -ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz +ARG RELEASE=8.7.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${RELEASE}.tar.gz ################################################################## # Setup diff --git a/linux/ecosystem/atlassian/crowd/latest/.env b/linux/ecosystem/atlassian/crowd/latest/.env index 4cb02770a..06c48552c 100644 --- a/linux/ecosystem/atlassian/crowd/latest/.env +++ b/linux/ecosystem/atlassian/crowd/latest/.env @@ -1,4 +1,4 @@ RELEASE=5.1.1 -DOWNLOAD_URL=https://product-downloads.atlassian.com/software/crowd/downloads/atlassian-crowd-5.1.1.tar.gz +DOWNLOAD_URL=https://product-downloads.atlassian.com/software/crowd/downloads/atlassian-crowd-${RELEASE}.tar.gz diff --git a/linux/ecosystem/atlassian/crowd/latest/Dockerfile b/linux/ecosystem/atlassian/crowd/latest/Dockerfile index 6f18c2e03..43cd94eb4 100644 --- a/linux/ecosystem/atlassian/crowd/latest/Dockerfile +++ b/linux/ecosystem/atlassian/crowd/latest/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.1.1 +ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/crowd/downloads/atlassian-crowd-${RELEASE}.tar.gz ################################################################## # Setup diff --git a/linux/ecosystem/atlassian/crowd/latest/Dockerfile.jdk11 b/linux/ecosystem/atlassian/crowd/latest/Dockerfile.jdk11 index b071cfc3e..913e5defb 100644 --- a/linux/ecosystem/atlassian/crowd/latest/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/crowd/latest/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.1.1 +ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/crowd/downloads/atlassian-crowd-${RELEASE}.tar.gz ################################################################## # Setup diff --git a/linux/ecosystem/atlassian/crowd/latest/docker-compose.yml b/linux/ecosystem/atlassian/crowd/latest/docker-compose.yml index f585cafa7..d524de699 100644 --- a/linux/ecosystem/atlassian/crowd/latest/docker-compose.yml +++ b/linux/ecosystem/atlassian/crowd/latest/docker-compose.yml @@ -4,17 +4,11 @@ services: image: "epicmorg/crowd:latest" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: image: "epicmorg/crowd:latest-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} # app-jdk17: # image: "epicmorg/crowd:latest-jdk17" # build: diff --git a/linux/ecosystem/atlassian/fisheye-crucible/latest/.env b/linux/ecosystem/atlassian/fisheye-crucible/latest/.env index cc3d229c4..ad0818826 100644 --- a/linux/ecosystem/atlassian/fisheye-crucible/latest/.env +++ b/linux/ecosystem/atlassian/fisheye-crucible/latest/.env @@ -1,3 +1,2 @@ - RELEASE=4.8.6 -DOWNLOAD_URL=https://www.atlassian.com/software/fisheye/downloads/binary/fisheye-4.8.6.zip +DOWNLOAD_URL=https://www.atlassian.com/software/fisheye/downloads/binary/fisheye-${RELEASE}.zip diff --git a/linux/ecosystem/atlassian/fisheye-crucible/latest/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/latest/Dockerfile index 6adfd48c5..a6e3318ce 100644 --- a/linux/ecosystem/atlassian/fisheye-crucible/latest/Dockerfile +++ b/linux/ecosystem/atlassian/fisheye-crucible/latest/Dockerfile @@ -5,8 +5,9 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL + +ARG RELEASE=4.8.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/fisheye/downloads/binary/fisheye-${RELEASE}.zip ################################################################## # Setup diff --git a/linux/ecosystem/atlassian/fisheye-crucible/latest/docker-compose.yml b/linux/ecosystem/atlassian/fisheye-crucible/latest/docker-compose.yml index e2145ee5f..a63e81d26 100644 --- a/linux/ecosystem/atlassian/fisheye-crucible/latest/docker-compose.yml +++ b/linux/ecosystem/atlassian/fisheye-crucible/latest/docker-compose.yml @@ -4,6 +4,3 @@ services: image: "epicmorg/fisheye-crucible:latest" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/10/10.0.0/.env b/linux/ecosystem/atlassian/jira/10/10.0.0/.env new file mode 100644 index 000000000..4e4458cfe --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.0.0/.env @@ -0,0 +1,2 @@ +RELEASE=10.0.0 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/10/10.0.0/Dockerfile b/linux/ecosystem/atlassian/jira/10/10.0.0/Dockerfile new file mode 100644 index 000000000..822736e9b --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.0.0/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=10.0.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/10/10.0.0/Makefile b/linux/ecosystem/atlassian/jira/10/10.0.0/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.0.0/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/10/10.0.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/10/10.0.0/docker-compose.yml new file mode 100644 index 000000000..4c704c67c --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.0.0/docker-compose.yml @@ -0,0 +1,10 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:10.0.0" + build: + context: . + app-jdk17: + image: "epicmorg/jira:10.0.0-jdk17" + build: + context: . \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/10/10.0.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/10/10.0.0/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.0.0/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/10/10.0.1/.env b/linux/ecosystem/atlassian/jira/10/10.0.1/.env new file mode 100644 index 000000000..46f3d651d --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.0.1/.env @@ -0,0 +1,2 @@ +RELEASE=10.0.1 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/10/10.0.1/Dockerfile b/linux/ecosystem/atlassian/jira/10/10.0.1/Dockerfile new file mode 100644 index 000000000..3554e93c9 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.0.1/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=10.0.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/10/10.0.1/Makefile b/linux/ecosystem/atlassian/jira/10/10.0.1/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.0.1/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/10/10.0.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/10/10.0.1/docker-compose.yml new file mode 100644 index 000000000..3f093b419 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.0.1/docker-compose.yml @@ -0,0 +1,10 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:10.0.1" + build: + context: . + app-jdk17: + image: "epicmorg/jira:10.0.1-jdk17" + build: + context: . \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/10/10.0.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/10/10.0.1/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.0.1/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/10/10.1.1/.env b/linux/ecosystem/atlassian/jira/10/10.1.1/.env new file mode 100644 index 000000000..4840e56e2 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.1.1/.env @@ -0,0 +1,2 @@ +RELEASE=10.1.1 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/10/10.1.1/Dockerfile b/linux/ecosystem/atlassian/jira/10/10.1.1/Dockerfile new file mode 100644 index 000000000..8d036c8ab --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.1.1/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=10.1.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/10/10.1.1/Makefile b/linux/ecosystem/atlassian/jira/10/10.1.1/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.1.1/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/10/10.1.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/10/10.1.1/docker-compose.yml new file mode 100644 index 000000000..8bfcd0370 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.1.1/docker-compose.yml @@ -0,0 +1,10 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:10.1.1" + build: + context: . + app-jdk17: + image: "epicmorg/jira:10.1.1-jdk17" + build: + context: . \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/10/10.1.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/10/10.1.1/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.1.1/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/10/10.1.2/.env b/linux/ecosystem/atlassian/jira/10/10.1.2/.env new file mode 100644 index 000000000..98cf0d81a --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.1.2/.env @@ -0,0 +1,2 @@ +RELEASE=10.1.2 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/10/10.1.2/Dockerfile b/linux/ecosystem/atlassian/jira/10/10.1.2/Dockerfile new file mode 100644 index 000000000..58e0c4e3b --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.1.2/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=10.1.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/10/10.1.2/Makefile b/linux/ecosystem/atlassian/jira/10/10.1.2/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.1.2/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/10/10.1.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/10/10.1.2/docker-compose.yml new file mode 100644 index 000000000..47952a1ab --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.1.2/docker-compose.yml @@ -0,0 +1,10 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:10.1.2" + build: + context: . + app-jdk17: + image: "epicmorg/jira:10.1.2-jdk17" + build: + context: . \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/10/10.1.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/10/10.1.2/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.1.2/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/10/10.2.0/.env b/linux/ecosystem/atlassian/jira/10/10.2.0/.env new file mode 100644 index 000000000..50557c03c --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.2.0/.env @@ -0,0 +1,2 @@ +RELEASE=10.2.0 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/10/10.2.0/Dockerfile b/linux/ecosystem/atlassian/jira/10/10.2.0/Dockerfile new file mode 100644 index 000000000..563a8d623 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.2.0/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=10.2.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/10/10.2.0/Makefile b/linux/ecosystem/atlassian/jira/10/10.2.0/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.2.0/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/10/10.2.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/10/10.2.0/docker-compose.yml new file mode 100644 index 000000000..0ff2204f3 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.2.0/docker-compose.yml @@ -0,0 +1,10 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:10.2.0" + build: + context: . + app-jdk17: + image: "epicmorg/jira:10.2.0-jdk17" + build: + context: . \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/10/10.2.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/10/10.2.0/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.2.0/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/10/10.2.1/.env b/linux/ecosystem/atlassian/jira/10/10.2.1/.env new file mode 100644 index 000000000..7e70dd928 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.2.1/.env @@ -0,0 +1,2 @@ +RELEASE=10.2.1 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/10/10.2.1/Dockerfile b/linux/ecosystem/atlassian/jira/10/10.2.1/Dockerfile new file mode 100644 index 000000000..f7a352a48 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.2.1/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=10.2.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/10/10.2.1/Makefile b/linux/ecosystem/atlassian/jira/10/10.2.1/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.2.1/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/10/10.2.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/10/10.2.1/docker-compose.yml new file mode 100644 index 000000000..6719d370f --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.2.1/docker-compose.yml @@ -0,0 +1,10 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:10.2.1" + build: + context: . + app-jdk17: + image: "epicmorg/jira:10.2.1-jdk17" + build: + context: . \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/10/10.2.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/10/10.2.1/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/10/10.2.1/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/4/4.1.1/.env b/linux/ecosystem/atlassian/jira/4/4.1.1/.env index b081f552f..cedaae4dd 100644 --- a/linux/ecosystem/atlassian/jira/4/4.1.1/.env +++ b/linux/ecosystem/atlassian/jira/4/4.1.1/.env @@ -1,3 +1,2 @@ - RELEASE=4.1.1 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.1.1-standalone.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-standalone.tar.gz diff --git a/linux/ecosystem/atlassian/jira/4/4.1.1/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.1.1/Dockerfile index b59e86954..a2ddd5ecb 100644 --- a/linux/ecosystem/atlassian/jira/4/4.1.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.1.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=4.1.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-standalone.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-enterprise-${RELEASE}-standalone.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/4/4.1.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/4/4.1.1/docker-compose.yml index 21b322779..fedcfb961 100644 --- a/linux/ecosystem/atlassian/jira/4/4.1.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/4/4.1.1/docker-compose.yml @@ -1,9 +1,10 @@ #version: '3' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:4.1.1" + build: + context: . + app-jdk6: + image: "epicmorg/jira:4.1.1-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/4/4.1.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/4/4.1.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/4/4.1.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/4/4.1.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/4/4.1.2/.env b/linux/ecosystem/atlassian/jira/4/4.1.2/.env index c0671a4f9..bb11758c6 100644 --- a/linux/ecosystem/atlassian/jira/4/4.1.2/.env +++ b/linux/ecosystem/atlassian/jira/4/4.1.2/.env @@ -1,3 +1,2 @@ - RELEASE=4.1.2 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.1.2-standalone.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-standalone.tar.gz diff --git a/linux/ecosystem/atlassian/jira/4/4.1.2/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.1.2/Dockerfile index b59e86954..0247f6eda 100644 --- a/linux/ecosystem/atlassian/jira/4/4.1.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.1.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=4.1.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-standalone.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-enterprise-${RELEASE}-standalone.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/4/4.1.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/4/4.1.2/docker-compose.yml index 21b322779..5a8855970 100644 --- a/linux/ecosystem/atlassian/jira/4/4.1.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/4/4.1.2/docker-compose.yml @@ -1,9 +1,10 @@ #version: '3' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:4.1.2" + build: + context: . + app-jdk6: + image: "epicmorg/jira:4.1.2-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/4/4.1.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/4/4.1.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/4/4.1.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/4/4.1.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/4/4.2.1/.env b/linux/ecosystem/atlassian/jira/4/4.2.1/.env index 0037a6009..30f67baec 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2.1/.env +++ b/linux/ecosystem/atlassian/jira/4/4.2.1/.env @@ -1,3 +1,2 @@ - RELEASE=4.2.1 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.2.1-b588-standalone.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-b588-standalone.tar.gz diff --git a/linux/ecosystem/atlassian/jira/4/4.2.1/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.2.1/Dockerfile index b59e86954..deb9a0d77 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.2.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=4.2.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-b588-standalone.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-enterprise-${RELEASE}-b588-standalone.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/4/4.2.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/4/4.2.1/docker-compose.yml index 21b322779..a968fbe56 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/4/4.2.1/docker-compose.yml @@ -1,9 +1,10 @@ #version: '3' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:4.2.1" + build: + context: . + app-jdk6: + image: "epicmorg/jira:4.2.1-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/4/4.2.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/4/4.2.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/4/4.2.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/4/4.2.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/4/4.2.2/.env b/linux/ecosystem/atlassian/jira/4/4.2.2/.env index 101bea911..83a2168dd 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2.2/.env +++ b/linux/ecosystem/atlassian/jira/4/4.2.2/.env @@ -1,3 +1,2 @@ - RELEASE=4.2.2 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.2.2-b589-standalone.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-b589-standalone.tar.gz diff --git a/linux/ecosystem/atlassian/jira/4/4.2.2/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.2.2/Dockerfile index b59e86954..2fc0b1f0c 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.2.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=4.2.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-b589-standalone.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-enterprise-${RELEASE}-b589-standalone.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/4/4.2.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/4/4.2.2/docker-compose.yml index 21b322779..471c343a7 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/4/4.2.2/docker-compose.yml @@ -1,9 +1,10 @@ #version: '3' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:4.2.2" + build: + context: . + app-jdk6: + image: "epicmorg/jira:4.2.2-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/4/4.2.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/4/4.2.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/4/4.2.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/4/4.2.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/4/4.2.3/.env b/linux/ecosystem/atlassian/jira/4/4.2.3/.env index c0477d73e..cdd409203 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2.3/.env +++ b/linux/ecosystem/atlassian/jira/4/4.2.3/.env @@ -1,3 +1,2 @@ - RELEASE=4.2.3 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.2.3-b590-standalone.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-b590-standalone.tar.gz diff --git a/linux/ecosystem/atlassian/jira/4/4.2.3/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.2.3/Dockerfile index b59e86954..a85d8541c 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.2.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=4.2.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-b590-standalone.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-enterprise-${RELEASE}-b590-standalone.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/4/4.2.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/4/4.2.3/docker-compose.yml index 21b322779..b1cd2e3c1 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/4/4.2.3/docker-compose.yml @@ -1,9 +1,10 @@ #version: '3' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:4.2.3" + build: + context: . + app-jdk6: + image: "epicmorg/jira:4.2.3-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/4/4.2.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/4/4.2.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/4/4.2.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/4/4.2.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/4/4.2.4/.env b/linux/ecosystem/atlassian/jira/4/4.2.4/.env index 6dbffd4c0..dfe2424c5 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2.4/.env +++ b/linux/ecosystem/atlassian/jira/4/4.2.4/.env @@ -1,3 +1,2 @@ - RELEASE=4.2.4 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.2.4-b591-standalone.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-b591-standalone.tar.gz diff --git a/linux/ecosystem/atlassian/jira/4/4.2.4/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.2.4/Dockerfile index b59e86954..7d504ba90 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.2.4/Dockerfile @@ -6,9 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL - +ARG RELEASE=4.2.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-b591-standalone.tar.gz ################################################################## # Setup ################################################################## @@ -28,15 +27,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-enterprise-${RELEASE}-b591-standalone.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/4/4.2.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/4/4.2.4/docker-compose.yml index 21b322779..7938fdbfd 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/4/4.2.4/docker-compose.yml @@ -1,9 +1,10 @@ #version: '3' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:4.2.4" + build: + context: . + app-jdk6: + image: "epicmorg/jira:4.2.4-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/4/4.2.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/4/4.2.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/4/4.2.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/4/4.2.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/4/4.2/.env b/linux/ecosystem/atlassian/jira/4/4.2/.env index b9a80805d..43399fdc4 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2/.env +++ b/linux/ecosystem/atlassian/jira/4/4.2/.env @@ -1,3 +1,2 @@ - RELEASE=4.2 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.2-standalone.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-standalone.tar.gz diff --git a/linux/ecosystem/atlassian/jira/4/4.2/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.2/Dockerfile index b59e86954..e744479ff 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=4.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-standalone.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-enterprise-${RELEASE}-standalone.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/4/4.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/4/4.2/docker-compose.yml index 21b322779..08caabe5b 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/4/4.2/docker-compose.yml @@ -1,9 +1,10 @@ #version: '3' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:4.2" + build: + context: . + app-jdk6: + image: "epicmorg/jira:4.2-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/4/4.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/4/4.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/4/4.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/4/4.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/4/4.3.1/.env b/linux/ecosystem/atlassian/jira/4/4.3.1/.env index 0d771ed2b..a884e5933 100644 --- a/linux/ecosystem/atlassian/jira/4/4.3.1/.env +++ b/linux/ecosystem/atlassian/jira/4/4.3.1/.env @@ -1,3 +1,2 @@ - RELEASE=4.3.1 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.3.1.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz diff --git a/linux/ecosystem/atlassian/jira/4/4.3.1/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.3.1/Dockerfile index b59e86954..aeaf6474d 100644 --- a/linux/ecosystem/atlassian/jira/4/4.3.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.3.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=4.3.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/4/4.3.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/4/4.3.1/docker-compose.yml index 21b322779..d132a91f8 100644 --- a/linux/ecosystem/atlassian/jira/4/4.3.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/4/4.3.1/docker-compose.yml @@ -1,9 +1,10 @@ #version: '3' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:4.3.1" + build: + context: . + app-jdk6: + image: "epicmorg/jira:4.3.1-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/4/4.3.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/4/4.3.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/4/4.3.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/4/4.3.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/4/4.3.2/.env b/linux/ecosystem/atlassian/jira/4/4.3.2/.env index f2a5f1b8c..30428b917 100644 --- a/linux/ecosystem/atlassian/jira/4/4.3.2/.env +++ b/linux/ecosystem/atlassian/jira/4/4.3.2/.env @@ -1,3 +1,2 @@ - RELEASE=4.3.2 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.3.2.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz diff --git a/linux/ecosystem/atlassian/jira/4/4.3.2/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.3.2/Dockerfile index b59e86954..482993898 100644 --- a/linux/ecosystem/atlassian/jira/4/4.3.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.3.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=4.3.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/4/4.3.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/4/4.3.2/docker-compose.yml index 21b322779..ffc27ef23 100644 --- a/linux/ecosystem/atlassian/jira/4/4.3.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/4/4.3.2/docker-compose.yml @@ -1,9 +1,10 @@ #version: '3' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:4.3.2" + build: + context: . + app-jdk6: + image: "epicmorg/jira:4.3.2-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/4/4.3.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/4/4.3.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/4/4.3.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/4/4.3.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/4/4.3.3/.env b/linux/ecosystem/atlassian/jira/4/4.3.3/.env index 368c7870d..b2c852603 100644 --- a/linux/ecosystem/atlassian/jira/4/4.3.3/.env +++ b/linux/ecosystem/atlassian/jira/4/4.3.3/.env @@ -1,3 +1,2 @@ - RELEASE=4.3.3 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.3.3.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz diff --git a/linux/ecosystem/atlassian/jira/4/4.3.3/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.3.3/Dockerfile index b59e86954..abc63a651 100644 --- a/linux/ecosystem/atlassian/jira/4/4.3.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.3.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=4.3.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/4/4.3.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/4/4.3.3/docker-compose.yml index 21b322779..47f866b52 100644 --- a/linux/ecosystem/atlassian/jira/4/4.3.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/4/4.3.3/docker-compose.yml @@ -1,9 +1,10 @@ #version: '3' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:4.3.3" + build: + context: . + app-jdk6: + image: "epicmorg/jira:4.3.3-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/4/4.3.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/4/4.3.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/4/4.3.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/4/4.3.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/4/4.3.4/.env b/linux/ecosystem/atlassian/jira/4/4.3.4/.env index 0d02c45d5..27f49cec5 100644 --- a/linux/ecosystem/atlassian/jira/4/4.3.4/.env +++ b/linux/ecosystem/atlassian/jira/4/4.3.4/.env @@ -1,3 +1,2 @@ - RELEASE=4.3.4 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.3.4.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz diff --git a/linux/ecosystem/atlassian/jira/4/4.3.4/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.3.4/Dockerfile index b59e86954..77d5a0b2f 100644 --- a/linux/ecosystem/atlassian/jira/4/4.3.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.3.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=4.3.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/4/4.3.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/4/4.3.4/docker-compose.yml index 21b322779..c00e7b309 100644 --- a/linux/ecosystem/atlassian/jira/4/4.3.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/4/4.3.4/docker-compose.yml @@ -1,9 +1,10 @@ #version: '3' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:4.3.4" + build: + context: . + app-jdk6: + image: "epicmorg/jira:4.3.4-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/4/4.3.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/4/4.3.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/4/4.3.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/4/4.3.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/4/4.3/.env b/linux/ecosystem/atlassian/jira/4/4.3/.env index 89efb9a85..8a037d4cc 100644 --- a/linux/ecosystem/atlassian/jira/4/4.3/.env +++ b/linux/ecosystem/atlassian/jira/4/4.3/.env @@ -1,3 +1,2 @@ - RELEASE=4.3 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.3.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz diff --git a/linux/ecosystem/atlassian/jira/4/4.3/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.3/Dockerfile index b59e86954..16245897e 100644 --- a/linux/ecosystem/atlassian/jira/4/4.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=4.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/4/4.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/4/4.3/docker-compose.yml index 21b322779..fcd70a074 100644 --- a/linux/ecosystem/atlassian/jira/4/4.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/4/4.3/docker-compose.yml @@ -1,9 +1,10 @@ #version: '3' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:4.3" + build: + context: . + app-jdk6: + image: "epicmorg/jira:4.3-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/4/4.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/4/4.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/4/4.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/4/4.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/4/4.4.1/.env b/linux/ecosystem/atlassian/jira/4/4.4.1/.env index a9c5185a6..fc3f7e7d3 100644 --- a/linux/ecosystem/atlassian/jira/4/4.4.1/.env +++ b/linux/ecosystem/atlassian/jira/4/4.4.1/.env @@ -1,3 +1,2 @@ - RELEASE=4.4.1 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.4.1.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz diff --git a/linux/ecosystem/atlassian/jira/4/4.4.1/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.4.1/Dockerfile index b59e86954..e14bab9b7 100644 --- a/linux/ecosystem/atlassian/jira/4/4.4.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.4.1/Dockerfile @@ -6,8 +6,9 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=4.4.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz + ################################################################## # Setup @@ -28,15 +29,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/4/4.4.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/4/4.4.1/docker-compose.yml index 21b322779..3831308a8 100644 --- a/linux/ecosystem/atlassian/jira/4/4.4.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/4/4.4.1/docker-compose.yml @@ -1,9 +1,10 @@ #version: '3' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:4.4.1" + build: + context: . + app-jdk6: + image: "epicmorg/jira:4.4.1-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/4/4.4.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/4/4.4.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/4/4.4.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/4/4.4.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/4/4.4.3/.env b/linux/ecosystem/atlassian/jira/4/4.4.3/.env index c7d84abc5..a017303f9 100644 --- a/linux/ecosystem/atlassian/jira/4/4.4.3/.env +++ b/linux/ecosystem/atlassian/jira/4/4.4.3/.env @@ -1,3 +1,2 @@ - RELEASE=4.4.3 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.4.3.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz diff --git a/linux/ecosystem/atlassian/jira/4/4.4.3/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.4.3/Dockerfile index b59e86954..6454e2a9e 100644 --- a/linux/ecosystem/atlassian/jira/4/4.4.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.4.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=4.4.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/4/4.4.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/4/4.4.3/docker-compose.yml index 21b322779..bcaf6a4d0 100644 --- a/linux/ecosystem/atlassian/jira/4/4.4.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/4/4.4.3/docker-compose.yml @@ -1,9 +1,10 @@ #version: '3' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:4.4.3" + build: + context: . + app-jdk6: + image: "epicmorg/jira:4.4.3-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/4/4.4.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/4/4.4.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/4/4.4.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/4/4.4.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/4/4.4.4/.env b/linux/ecosystem/atlassian/jira/4/4.4.4/.env index fb37a864d..8bcc45259 100644 --- a/linux/ecosystem/atlassian/jira/4/4.4.4/.env +++ b/linux/ecosystem/atlassian/jira/4/4.4.4/.env @@ -1,3 +1,2 @@ - RELEASE=4.4.4 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.4.4.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz diff --git a/linux/ecosystem/atlassian/jira/4/4.4.4/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.4.4/Dockerfile index b59e86954..2670d0fb7 100644 --- a/linux/ecosystem/atlassian/jira/4/4.4.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.4.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=4.4.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/4/4.4.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/4/4.4.4/docker-compose.yml index 21b322779..e715dfa2a 100644 --- a/linux/ecosystem/atlassian/jira/4/4.4.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/4/4.4.4/docker-compose.yml @@ -1,9 +1,10 @@ #version: '3' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:4.4.4" + build: + context: . + app-jdk6: + image: "epicmorg/jira:4.4.4-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/4/4.4.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/4/4.4.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/4/4.4.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/4/4.4.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/4/4.4.5/.env b/linux/ecosystem/atlassian/jira/4/4.4.5/.env index c8a82755a..6054d60be 100644 --- a/linux/ecosystem/atlassian/jira/4/4.4.5/.env +++ b/linux/ecosystem/atlassian/jira/4/4.4.5/.env @@ -1,3 +1,2 @@ - RELEASE=4.4.5 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.4.5.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz diff --git a/linux/ecosystem/atlassian/jira/4/4.4.5/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.4.5/Dockerfile index b59e86954..67b4f78d5 100644 --- a/linux/ecosystem/atlassian/jira/4/4.4.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.4.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=4.4.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/4/4.4.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/4/4.4.5/docker-compose.yml index 21b322779..d16fa835e 100644 --- a/linux/ecosystem/atlassian/jira/4/4.4.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/4/4.4.5/docker-compose.yml @@ -1,9 +1,10 @@ #version: '3' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:4.4.5" + build: + context: . + app-jdk6: + image: "epicmorg/jira:4.4.5-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/4/4.4.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/4/4.4.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/4/4.4.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/4/4.4.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/4/4.4/.env b/linux/ecosystem/atlassian/jira/4/4.4/.env index 3d1900c83..d9cccb536 100644 --- a/linux/ecosystem/atlassian/jira/4/4.4/.env +++ b/linux/ecosystem/atlassian/jira/4/4.4/.env @@ -1,3 +1,2 @@ - RELEASE=4.4 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.4.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz diff --git a/linux/ecosystem/atlassian/jira/4/4.4/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.4/Dockerfile index b59e86954..0243f48b6 100644 --- a/linux/ecosystem/atlassian/jira/4/4.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=4.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/4/4.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/4/4.4/docker-compose.yml index 21b322779..28cf0296f 100644 --- a/linux/ecosystem/atlassian/jira/4/4.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/4/4.4/docker-compose.yml @@ -1,9 +1,10 @@ #version: '3' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:4.4" + build: + context: . + app-jdk6: + image: "epicmorg/jira:4.4-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/4/4.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/4/4.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/4/4.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/4/4.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.0.1/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.0.1/Dockerfile index b59e86954..508d30b00 100644 --- a/linux/ecosystem/atlassian/jira/5/5.0.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.0.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.0.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.0.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.0.1/docker-compose.yml index 21b322779..302ba8499 100644 --- a/linux/ecosystem/atlassian/jira/5/5.0.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.0.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.0.1" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.0.1-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.0.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.0.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.0.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.0.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.0.2/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.0.2/Dockerfile index b59e86954..7b1b3a2bc 100644 --- a/linux/ecosystem/atlassian/jira/5/5.0.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.0.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.0.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.0.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.0.2/docker-compose.yml index 21b322779..287f284a2 100644 --- a/linux/ecosystem/atlassian/jira/5/5.0.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.0.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.0.2" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.0.2-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.0.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.0.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.0.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.0.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.0.3/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.0.3/Dockerfile index b59e86954..3249d8f7e 100644 --- a/linux/ecosystem/atlassian/jira/5/5.0.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.0.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.0.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.0.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.0.3/docker-compose.yml index 21b322779..1504369f5 100644 --- a/linux/ecosystem/atlassian/jira/5/5.0.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.0.3/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.0.3" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.0.3-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.0.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.0.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.0.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.0.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.0.4/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.0.4/Dockerfile index b59e86954..a945474b6 100644 --- a/linux/ecosystem/atlassian/jira/5/5.0.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.0.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.0.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.0.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.0.4/docker-compose.yml index 21b322779..cf4d56069 100644 --- a/linux/ecosystem/atlassian/jira/5/5.0.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.0.4/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.0.4" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.0.4-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.0.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.0.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.0.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.0.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.0.5/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.0.5/Dockerfile index b59e86954..a9adad55f 100644 --- a/linux/ecosystem/atlassian/jira/5/5.0.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.0.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.0.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.0.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.0.5/docker-compose.yml index 21b322779..4bae01ed3 100644 --- a/linux/ecosystem/atlassian/jira/5/5.0.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.0.5/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.0.5" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.0.5-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.0.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.0.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.0.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.0.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.0.6/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.0.6/Dockerfile index b59e86954..3c90a89cc 100644 --- a/linux/ecosystem/atlassian/jira/5/5.0.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.0.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.0.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.0.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.0.6/docker-compose.yml index 21b322779..3145209e4 100644 --- a/linux/ecosystem/atlassian/jira/5/5.0.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.0.6/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.0.6" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.0.6-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.0.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.0.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.0.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.0.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.0.7/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.0.7/Dockerfile index b59e86954..0c5d9b35d 100644 --- a/linux/ecosystem/atlassian/jira/5/5.0.7/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.0.7/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.0.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.0.7/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.0.7/docker-compose.yml index 21b322779..47ac01ac9 100644 --- a/linux/ecosystem/atlassian/jira/5/5.0.7/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.0.7/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.0.7" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.0.7-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.0.7/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.0.7/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.0.7/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.0.7/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.0/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.0/Dockerfile index b59e86954..0f8e21fe0 100644 --- a/linux/ecosystem/atlassian/jira/5/5.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.0/docker-compose.yml index 21b322779..5a686b14a 100644 --- a/linux/ecosystem/atlassian/jira/5/5.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.0" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.0-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.1.1/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1.1/Dockerfile index b59e86954..acf3fc5e8 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.1.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.1.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.1.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.1.1/docker-compose.yml index 21b322779..c221eeb74 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.1.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.1.1" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.1.1-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.1.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.1.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.1.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.1.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.1.2/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1.2/Dockerfile index b59e86954..d7bffc8b5 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.1.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.1.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.1.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.1.2/docker-compose.yml index 21b322779..bb71d7f24 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.1.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.1.2" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.1.2-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.1.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.1.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.1.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.1.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.1.3/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1.3/Dockerfile index b59e86954..92e97bfbe 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.1.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.1.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.1.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.1.3/docker-compose.yml index 21b322779..8c4d39be2 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.1.3/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.1.3" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.1.3-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.1.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.1.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.1.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.1.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.1.4/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1.4/Dockerfile index b59e86954..f1678f4dd 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.1.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.1.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.1.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.1.4/docker-compose.yml index 21b322779..a0d9d3190 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.1.4/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.1.4" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.1.4-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.1.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.1.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.1.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.1.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.1.5/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1.5/Dockerfile index b59e86954..d848b902f 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.1.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.1.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.1.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.1.5/docker-compose.yml index 21b322779..43f369b39 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.1.5/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.1.5" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.1.5-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.1.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.1.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.1.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.1.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.1.6/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1.6/Dockerfile index b59e86954..c7b2348dd 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.1.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.1.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.1.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.1.6/docker-compose.yml index 21b322779..ad1f1094f 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.1.6/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.1.6" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.1.6-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.1.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.1.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.1.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.1.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.1.7/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1.7/Dockerfile index b59e86954..1a91e2cef 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1.7/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.1.7/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.1.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.1.7/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.1.7/docker-compose.yml index 21b322779..41c797430 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1.7/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.1.7/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.1.7" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.1.7-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.1.7/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.1.7/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.1.7/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.1.7/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.1.8/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1.8/Dockerfile index b59e86954..663544300 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1.8/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.1.8/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.1.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.1.8/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.1.8/docker-compose.yml index 21b322779..f6042749e 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1.8/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.1.8/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.1.8" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.1.8-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.1.8/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.1.8/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.1.8/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.1.8/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.1/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1/Dockerfile index b59e86954..9ae5de502 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.1/docker-compose.yml index 21b322779..05ad7c938 100644 --- a/linux/ecosystem/atlassian/jira/5/5.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.1" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.1-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.2.1/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.1/Dockerfile index b59e86954..bd1880934 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.2.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.1/Dockerfile.jdk7 b/linux/ecosystem/atlassian/jira/5/5.2.1/Dockerfile.jdk7 index 41a2e1710..d0ab77bf4 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.1/Dockerfile.jdk7 +++ b/linux/ecosystem/atlassian/jira/5/5.2.1/Dockerfile.jdk7 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.2.1/docker-compose.yml index 9a331905c..c8f5a2e17 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.2.1/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.2.1" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.2.1-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk7: - image: "epicmorg/jira:${RELEASE}-jdk7" + image: "epicmorg/jira:5.2.1-jdk7" build: context: . dockerfile: Dockerfile.jdk7 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.2.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.2.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.2.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.2.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.2.10/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.10/Dockerfile index b59e86954..964e4dd29 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.10/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.2.10/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.10/Dockerfile.jdk7 b/linux/ecosystem/atlassian/jira/5/5.2.10/Dockerfile.jdk7 index 41a2e1710..800a992a4 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.10/Dockerfile.jdk7 +++ b/linux/ecosystem/atlassian/jira/5/5.2.10/Dockerfile.jdk7 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.10/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.2.10/docker-compose.yml index 9a331905c..91ded9f22 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.10/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.2.10/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.2.10" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.2.10-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk7: - image: "epicmorg/jira:${RELEASE}-jdk7" + image: "epicmorg/jira:5.2.10-jdk7" build: context: . dockerfile: Dockerfile.jdk7 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.2.10/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.2.10/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.2.10/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.2.10/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.2.11/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.11/Dockerfile index b59e86954..5206dd2f1 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.11/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.2.11/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.11/Dockerfile.jdk7 b/linux/ecosystem/atlassian/jira/5/5.2.11/Dockerfile.jdk7 index 41a2e1710..846b657d4 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.11/Dockerfile.jdk7 +++ b/linux/ecosystem/atlassian/jira/5/5.2.11/Dockerfile.jdk7 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.11/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.2.11/docker-compose.yml index 9a331905c..ee0a6f6d5 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.11/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.2.11/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.2.11" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.2.11-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk7: - image: "epicmorg/jira:${RELEASE}-jdk7" + image: "epicmorg/jira:5.2.11-jdk7" build: context: . dockerfile: Dockerfile.jdk7 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.2.11/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.2.11/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.2.11/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.2.11/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.2.2/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.2/Dockerfile index b59e86954..87beea1e5 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.2.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.2/Dockerfile.jdk7 b/linux/ecosystem/atlassian/jira/5/5.2.2/Dockerfile.jdk7 index 41a2e1710..f40c13633 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.2/Dockerfile.jdk7 +++ b/linux/ecosystem/atlassian/jira/5/5.2.2/Dockerfile.jdk7 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.2.2/docker-compose.yml index 9a331905c..a658912ce 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.2.2/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.2.2" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.2.2-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk7: - image: "epicmorg/jira:${RELEASE}-jdk7" + image: "epicmorg/jira:5.2.2-jdk7" build: context: . dockerfile: Dockerfile.jdk7 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.2.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.2.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.2.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.2.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.2.3/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.3/Dockerfile index b59e86954..5ce6104df 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.2.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.3/Dockerfile.jdk7 b/linux/ecosystem/atlassian/jira/5/5.2.3/Dockerfile.jdk7 index 41a2e1710..f2c6e97ff 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.3/Dockerfile.jdk7 +++ b/linux/ecosystem/atlassian/jira/5/5.2.3/Dockerfile.jdk7 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.2.3/docker-compose.yml index 9a331905c..a4115b348 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.2.3/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.2.3" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.2.3-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk7: - image: "epicmorg/jira:${RELEASE}-jdk7" + image: "epicmorg/jira:5.2.3-jdk7" build: context: . dockerfile: Dockerfile.jdk7 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.2.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.2.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.2.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.2.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.2.4.1/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.4.1/Dockerfile index b59e86954..634949300 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.4.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.2.4.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.4.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.4.1/Dockerfile.jdk7 b/linux/ecosystem/atlassian/jira/5/5.2.4.1/Dockerfile.jdk7 index 41a2e1710..d79299419 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.4.1/Dockerfile.jdk7 +++ b/linux/ecosystem/atlassian/jira/5/5.2.4.1/Dockerfile.jdk7 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.4.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.4.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.2.4.1/docker-compose.yml index 9a331905c..4d4383005 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.4.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.2.4.1/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.2.4.1" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.2.4.1-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk7: - image: "epicmorg/jira:${RELEASE}-jdk7" + image: "epicmorg/jira:5.2.4.1-jdk7" build: context: . dockerfile: Dockerfile.jdk7 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.2.4.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.2.4.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.2.4.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.2.4.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.2.4/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.4/Dockerfile index b59e86954..9d3b38444 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.2.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.4/Dockerfile.jdk7 b/linux/ecosystem/atlassian/jira/5/5.2.4/Dockerfile.jdk7 index 41a2e1710..50fb2fc1a 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.4/Dockerfile.jdk7 +++ b/linux/ecosystem/atlassian/jira/5/5.2.4/Dockerfile.jdk7 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.2.4/docker-compose.yml index 9a331905c..4aacca675 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.2.4/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.2.4" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.2.4-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk7: - image: "epicmorg/jira:${RELEASE}-jdk7" + image: "epicmorg/jira:5.2.4-jdk7" build: context: . dockerfile: Dockerfile.jdk7 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.2.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.2.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.2.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.2.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.2.5/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.5/Dockerfile index b59e86954..bd3f229c3 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.2.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.5/Dockerfile.jdk7 b/linux/ecosystem/atlassian/jira/5/5.2.5/Dockerfile.jdk7 index 41a2e1710..b83998163 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.5/Dockerfile.jdk7 +++ b/linux/ecosystem/atlassian/jira/5/5.2.5/Dockerfile.jdk7 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.2.5/docker-compose.yml index 9a331905c..4eb3830cb 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.2.5/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.2.5" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.2.5-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk7: - image: "epicmorg/jira:${RELEASE}-jdk7" + image: "epicmorg/jira:5.2.5-jdk7" build: context: . dockerfile: Dockerfile.jdk7 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.2.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.2.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.2.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.2.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.2.6/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.6/Dockerfile index b59e86954..95a0aba03 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.2.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.6/Dockerfile.jdk7 b/linux/ecosystem/atlassian/jira/5/5.2.6/Dockerfile.jdk7 index 41a2e1710..93f20d513 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.6/Dockerfile.jdk7 +++ b/linux/ecosystem/atlassian/jira/5/5.2.6/Dockerfile.jdk7 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.2.6/docker-compose.yml index 9a331905c..c21091a4a 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.2.6/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.2.6" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.2.6-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk7: - image: "epicmorg/jira:${RELEASE}-jdk7" + image: "epicmorg/jira:5.2.6-jdk7" build: context: . dockerfile: Dockerfile.jdk7 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.2.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.2.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.2.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.2.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.2.7/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.7/Dockerfile index b59e86954..ab9f8f492 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.7/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.2.7/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.7/Dockerfile.jdk7 b/linux/ecosystem/atlassian/jira/5/5.2.7/Dockerfile.jdk7 index 41a2e1710..06105f98a 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.7/Dockerfile.jdk7 +++ b/linux/ecosystem/atlassian/jira/5/5.2.7/Dockerfile.jdk7 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.7/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.2.7/docker-compose.yml index 9a331905c..52ac7666e 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.7/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.2.7/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.2.7" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.2.7-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk7: - image: "epicmorg/jira:${RELEASE}-jdk7" + image: "epicmorg/jira:5.2.7-jdk7" build: context: . dockerfile: Dockerfile.jdk7 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.2.7/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.2.7/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.2.7/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.2.7/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.2.8/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.8/Dockerfile index b59e86954..3f0bdd91d 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.8/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.2.8/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.8/Dockerfile.jdk7 b/linux/ecosystem/atlassian/jira/5/5.2.8/Dockerfile.jdk7 index 41a2e1710..4e574b807 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.8/Dockerfile.jdk7 +++ b/linux/ecosystem/atlassian/jira/5/5.2.8/Dockerfile.jdk7 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.8/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.2.8/docker-compose.yml index 9a331905c..031938834 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.8/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.2.8/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.2.8" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.2.8-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk7: - image: "epicmorg/jira:${RELEASE}-jdk7" + image: "epicmorg/jira:5.2.8-jdk7" build: context: . dockerfile: Dockerfile.jdk7 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.2.8/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.2.8/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.2.8/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.2.8/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.2.9/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.9/Dockerfile index b59e86954..a50fd18df 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.9/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.2.9/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.9/Dockerfile.jdk7 b/linux/ecosystem/atlassian/jira/5/5.2.9/Dockerfile.jdk7 index 41a2e1710..f32c6eeae 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.9/Dockerfile.jdk7 +++ b/linux/ecosystem/atlassian/jira/5/5.2.9/Dockerfile.jdk7 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2.9/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.2.9/docker-compose.yml index 9a331905c..daa22902e 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2.9/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.2.9/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.2.9" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.2.9-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk7: - image: "epicmorg/jira:${RELEASE}-jdk7" + image: "epicmorg/jira:5.2.9-jdk7" build: context: . dockerfile: Dockerfile.jdk7 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.2.9/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.2.9/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.2.9/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.2.9/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/5/5.2/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2/Dockerfile index b59e86954..4462dbcc9 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/5/5.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2/Dockerfile.jdk7 b/linux/ecosystem/atlassian/jira/5/5.2/Dockerfile.jdk7 index 41a2e1710..c240b93ad 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2/Dockerfile.jdk7 +++ b/linux/ecosystem/atlassian/jira/5/5.2/Dockerfile.jdk7 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=5.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/5/5.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/5/5.2/docker-compose.yml index 9a331905c..711ea348f 100644 --- a/linux/ecosystem/atlassian/jira/5/5.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/5/5.2/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:5.2" + build: + context: . + app-jdk6: + image: "epicmorg/jira:5.2-jdk6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk7: - image: "epicmorg/jira:${RELEASE}-jdk7" + image: "epicmorg/jira:5.2-jdk7" build: context: . dockerfile: Dockerfile.jdk7 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/5/5.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/5/5.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/5/5.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/5/5.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.0.1/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0.1/Dockerfile index 41a2e1710..e35b75dbb 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.0.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.0.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.0.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.0.1/docker-compose.yml index 21b322779..11e4330dd 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.0.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.0.1" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.0.1-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.0.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.0.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.0.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.0.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.0.2/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0.2/Dockerfile index 41a2e1710..e5e12bc6f 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.0.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.0.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.0.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.0.2/docker-compose.yml index 21b322779..1903f7091 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.0.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.0.2" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.0.2-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.0.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.0.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.0.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.0.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.0.3/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0.3/Dockerfile index 41a2e1710..6da5c6fc7 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.0.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.0.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.0.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.0.3/docker-compose.yml index 21b322779..8171526a4 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.0.3/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.0.3" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.0.3-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.0.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.0.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.0.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.0.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.0.4/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0.4/Dockerfile index 41a2e1710..fbfaad105 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.0.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.0.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.0.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.0.4/docker-compose.yml index 21b322779..cd1067fe2 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.0.4/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.0.4" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.0.4-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.0.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.0.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.0.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.0.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.0.5/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0.5/Dockerfile index 41a2e1710..da5893921 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.0.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.0.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.0.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.0.5/docker-compose.yml index 21b322779..26e214b55 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.0.5/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.0.5" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.0.5-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.0.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.0.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.0.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.0.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.0.6/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0.6/Dockerfile index 41a2e1710..28c9155a0 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.0.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.0.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.0.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.0.6/docker-compose.yml index 21b322779..dde920d15 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.0.6/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.0.6" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.0.6-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.0.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.0.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.0.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.0.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.0.7/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0.7/Dockerfile index 41a2e1710..6e8e137d0 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0.7/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.0.7/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.0.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.0.7/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.0.7/docker-compose.yml index 21b322779..5d369a099 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0.7/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.0.7/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.0.7" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.0.7-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.0.7/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.0.7/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.0.7/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.0.7/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.0.8/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0.8/Dockerfile index 41a2e1710..1d5049c4f 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0.8/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.0.8/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.0.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.0.8/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.0.8/docker-compose.yml index 21b322779..e2f0e53c5 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0.8/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.0.8/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.0.8" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.0.8-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.0.8/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.0.8/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.0.8/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.0.8/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.0/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0/Dockerfile index 41a2e1710..7ec871553 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.0/docker-compose.yml index 21b322779..600dfd184 100644 --- a/linux/ecosystem/atlassian/jira/6/6.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.0" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.0-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.1.1/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.1/Dockerfile index 41a2e1710..a99996dc3 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.1.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.1.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.1.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.1.1/docker-compose.yml index 21b322779..d8cec83d3 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.1.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.1.1" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.1.1-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.1.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.1.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.1.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.1.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.1.2/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.2/Dockerfile index 41a2e1710..33fe10772 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.1.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.1.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.1.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.1.2/docker-compose.yml index 21b322779..6b08ffbfe 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.1.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.1.2" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.1.2-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.1.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.1.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.1.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.1.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.1.3/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.3/Dockerfile index 41a2e1710..39d13f95f 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.1.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.1.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.1.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.1.3/docker-compose.yml index 21b322779..9caf26ad1 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.1.3/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.1.3" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.1.3-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.1.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.1.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.1.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.1.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.1.4/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.4/Dockerfile index 41a2e1710..4f4ad5300 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.1.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.1.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.1.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.1.4/docker-compose.yml index 21b322779..bf5f68c87 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.1.4/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.1.4" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.1.4-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.1.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.1.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.1.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.1.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.1.5/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.5/Dockerfile index 41a2e1710..f401c88d5 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.1.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.1.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.1.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.1.5/docker-compose.yml index 21b322779..e3802f750 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.1.5/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.1.5" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.1.5-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.1.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.1.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.1.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.1.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.1.6/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.6/Dockerfile index 41a2e1710..5b457c9f6 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.1.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.1.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.1.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.1.6/docker-compose.yml index 21b322779..c89a01f5f 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.1.6/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.1.6" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.1.6-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.1.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.1.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.1.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.1.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.1.7/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.7/Dockerfile index 41a2e1710..192e70ba5 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.7/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.1.7/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.1.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.1.7/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.1.7/docker-compose.yml index 21b322779..c0613d4b6 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.7/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.1.7/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.1.7" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.1.7-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.1.7/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.1.7/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.1.7/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.1.7/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.1.8/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.8/Dockerfile index 41a2e1710..4019f2d7f 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.8/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.1.8/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.1.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.1.8/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.1.8/docker-compose.yml index 21b322779..c931ba9b7 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.8/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.1.8/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.1.8" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.1.8-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.1.8/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.1.8/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.1.8/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.1.8/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.1.9/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.9/Dockerfile index 41a2e1710..aa3b1e5f4 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.9/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.1.9/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.1.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.1.9/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.1.9/docker-compose.yml index 21b322779..a2ce6807a 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1.9/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.1.9/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.1.9" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.1.9-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.1.9/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.1.9/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.1.9/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.1.9/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.1/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1/Dockerfile index 41a2e1710..75994dff5 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.1/docker-compose.yml index 21b322779..947a6d7bb 100644 --- a/linux/ecosystem/atlassian/jira/6/6.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.1" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.1-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.2.1/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.2.1/Dockerfile index 41a2e1710..7dea7109b 100644 --- a/linux/ecosystem/atlassian/jira/6/6.2.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.2.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.2.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.2.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.2.1/docker-compose.yml index 21b322779..06b06826d 100644 --- a/linux/ecosystem/atlassian/jira/6/6.2.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.2.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.2.1" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.2.1-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.2.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.2.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.2.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.2.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.2.2/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.2.2/Dockerfile index 41a2e1710..af31ea60f 100644 --- a/linux/ecosystem/atlassian/jira/6/6.2.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.2.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.2.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.2.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.2.2/docker-compose.yml index 21b322779..6e5c2eb74 100644 --- a/linux/ecosystem/atlassian/jira/6/6.2.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.2.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.2.2" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.2.2-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.2.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.2.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.2.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.2.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.2.3/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.2.3/Dockerfile index 41a2e1710..f5f6da059 100644 --- a/linux/ecosystem/atlassian/jira/6/6.2.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.2.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.2.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.2.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.2.3/docker-compose.yml index 21b322779..0a15b8285 100644 --- a/linux/ecosystem/atlassian/jira/6/6.2.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.2.3/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.2.3" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.2.3-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.2.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.2.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.2.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.2.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.2.4/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.2.4/Dockerfile index 41a2e1710..c14df25b2 100644 --- a/linux/ecosystem/atlassian/jira/6/6.2.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.2.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.2.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.2.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.2.4/docker-compose.yml index 21b322779..87e973746 100644 --- a/linux/ecosystem/atlassian/jira/6/6.2.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.2.4/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.2.4" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.2.4-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.2.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.2.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.2.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.2.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.2.5/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.2.5/Dockerfile index 41a2e1710..c83fd0489 100644 --- a/linux/ecosystem/atlassian/jira/6/6.2.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.2.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.2.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.2.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.2.5/docker-compose.yml index 21b322779..ef934e185 100644 --- a/linux/ecosystem/atlassian/jira/6/6.2.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.2.5/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.2.5" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.2.5-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.2.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.2.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.2.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.2.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.2.6/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.2.6/Dockerfile index 41a2e1710..59c51db5e 100644 --- a/linux/ecosystem/atlassian/jira/6/6.2.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.2.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.2.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.2.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.2.6/docker-compose.yml index 21b322779..bbb10acff 100644 --- a/linux/ecosystem/atlassian/jira/6/6.2.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.2.6/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.2.6" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.2.6-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.2.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.2.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.2.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.2.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.2.7/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.2.7/Dockerfile index 41a2e1710..3992da1b6 100644 --- a/linux/ecosystem/atlassian/jira/6/6.2.7/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.2.7/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.2.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.2.7/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.2.7/docker-compose.yml index 21b322779..13169bf29 100644 --- a/linux/ecosystem/atlassian/jira/6/6.2.7/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.2.7/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.2.7" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.2.7-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.2.7/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.2.7/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.2.7/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.2.7/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.2/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.2/Dockerfile index 41a2e1710..dac74f457 100644 --- a/linux/ecosystem/atlassian/jira/6/6.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.2/docker-compose.yml index 21b322779..e953e9712 100644 --- a/linux/ecosystem/atlassian/jira/6/6.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.2" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.2-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.3.1/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.1/Dockerfile index 41a2e1710..388a992ef 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.3.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.1/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.3.1/Dockerfile.jdk8 index 72eb6178e..2fd1b5fbe 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.1/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.3.1/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.3.1/docker-compose.yml index e07873770..9b5fc923a 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.3.1/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.3.1" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.3.1-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.3.1-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.3.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.3.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.3.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.3.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.3.10/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.10/Dockerfile index 41a2e1710..6ee7212ec 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.10/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.3.10/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.10/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.3.10/Dockerfile.jdk8 index 72eb6178e..03fd57d0c 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.10/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.3.10/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.10/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.3.10/docker-compose.yml index e07873770..8bfcb94ec 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.10/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.3.10/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.3.10" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.3.10-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.3.10-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.3.10/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.3.10/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.3.10/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.3.10/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.3.11/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.11/Dockerfile index 41a2e1710..2b2b6360d 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.11/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.3.11/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.11/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.3.11/Dockerfile.jdk8 index 72eb6178e..ebad41885 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.11/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.3.11/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.11/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.3.11/docker-compose.yml index e07873770..c8d3796d4 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.11/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.3.11/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.3.11" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.3.11-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.3.11-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.3.11/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.3.11/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.3.11/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.3.11/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.3.12/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.12/Dockerfile index 41a2e1710..9c53f9194 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.12/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.3.12/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.12 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.12/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.3.12/Dockerfile.jdk8 index 72eb6178e..c9cf1b2da 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.12/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.3.12/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.12 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.12/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.3.12/docker-compose.yml index e07873770..237ec59c1 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.12/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.3.12/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.3.12" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.3.12-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.3.12-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.3.12/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.3.12/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.3.12/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.3.12/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.3.13/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.13/Dockerfile index 41a2e1710..ecbee8ad4 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.13/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.3.13/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.13 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.13/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.3.13/Dockerfile.jdk8 index 72eb6178e..ff56a1b82 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.13/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.3.13/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.13 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.13/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.3.13/docker-compose.yml index e07873770..0a2d5cc28 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.13/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.3.13/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.3.13" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.3.13-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.3.13-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.3.13/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.3.13/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.3.13/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.3.13/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.3.14/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.14/Dockerfile index 41a2e1710..76c4d25d8 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.14/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.3.14/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.14/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.3.14/Dockerfile.jdk8 index 72eb6178e..470a9b90b 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.14/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.3.14/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.14/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.3.14/docker-compose.yml index e07873770..0457ea6d7 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.14/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.3.14/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.3.14" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.3.14-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.3.14-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.3.14/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.3.14/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.3.14/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.3.14/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.3.15/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.15/Dockerfile index 41a2e1710..a5628324a 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.15/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.3.15/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.15 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.15/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.3.15/Dockerfile.jdk8 index 72eb6178e..a2ea55480 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.15/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.3.15/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.15 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.15/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.3.15/docker-compose.yml index e07873770..f878287ab 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.15/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.3.15/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.3.15" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.3.15-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.3.15-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.3.15/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.3.15/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.3.15/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.3.15/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.3.3/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.3/Dockerfile index 41a2e1710..aefd37019 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.3.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.3/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.3.3/Dockerfile.jdk8 index 72eb6178e..c966801bd 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.3/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.3.3/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.3.3/docker-compose.yml index e07873770..15fb841c8 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.3.3/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.3.3" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.3.3-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.3.3-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.3.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.3.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.3.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.3.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.3.4/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.4/Dockerfile index 41a2e1710..8bfdf9bc6 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.3.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.4/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.3.4/Dockerfile.jdk8 index 72eb6178e..ab3040a66 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.4/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.3.4/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.3.4/docker-compose.yml index e07873770..f427a56af 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.3.4/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.3.4" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.3.4-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.3.4-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.3.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.3.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.3.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.3.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.3.5/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.5/Dockerfile index 41a2e1710..785663d8b 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.3.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.5/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.3.5/Dockerfile.jdk8 index 72eb6178e..b98ebb92a 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.5/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.3.5/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.3.5/docker-compose.yml index e07873770..a11e96630 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.3.5/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.3.5" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.3.5-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.3.5-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.3.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.3.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.3.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.3.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.3.6/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.6/Dockerfile index 41a2e1710..46d56c610 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.3.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.6/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.3.6/Dockerfile.jdk8 index 72eb6178e..9fce97330 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.6/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.3.6/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.3.6/docker-compose.yml index e07873770..b951f3357 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.3.6/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.3.6" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.3.6-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.3.6-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.3.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.3.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.3.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.3.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.3.7/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.7/Dockerfile index 41a2e1710..a701eb328 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.7/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.3.7/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.7/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.3.7/Dockerfile.jdk8 index 72eb6178e..aa7c3ce51 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.7/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.3.7/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.7/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.3.7/docker-compose.yml index e07873770..137a698c0 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.7/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.3.7/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.3.7" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.3.7-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.3.7-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.3.7/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.3.7/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.3.7/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.3.7/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.3.8/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.8/Dockerfile index 41a2e1710..07fa25578 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.8/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.3.8/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.8/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.3.8/Dockerfile.jdk8 index 72eb6178e..128682381 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.8/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.3.8/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.8/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.3.8/docker-compose.yml index e07873770..d10742dcc 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.8/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.3.8/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.3.8" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.3.8-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.3.8-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.3.8/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.3.8/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.3.8/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.3.8/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.3.9/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.9/Dockerfile index 41a2e1710..3388f11b2 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.9/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.3.9/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.9/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.3.9/Dockerfile.jdk8 index 72eb6178e..c9911a9eb 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.9/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.3.9/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3.9/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.3.9/docker-compose.yml index e07873770..a9ad1828a 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3.9/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.3.9/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.3.9" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.3.9-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.3.9-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.3.9/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.3.9/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.3.9/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.3.9/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.3/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3/Dockerfile index 41a2e1710..d01137129 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.3/Dockerfile.jdk8 index 72eb6178e..e7837db3a 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.3/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.3/docker-compose.yml index e07873770..fbc31d6ca 100644 --- a/linux/ecosystem/atlassian/jira/6/6.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.3/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.3" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.3-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.3-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.4.1/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.1/Dockerfile index 41a2e1710..4a0400e80 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.4.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.1/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.4.1/Dockerfile.jdk8 index 72eb6178e..cddc68ca7 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.1/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.4.1/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.4.1/docker-compose.yml index e07873770..52b4802ec 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.4.1/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.4.1" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.4.1-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.4.1-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.4.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.4.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.4.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.4.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.4.10/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.10/Dockerfile index 41a2e1710..71b2452c5 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.10/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.4.10/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.10/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.4.10/Dockerfile.jdk8 index 72eb6178e..5d94280ac 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.10/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.4.10/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.10/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.4.10/docker-compose.yml index e07873770..a4425974b 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.10/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.4.10/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.4.10" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.4.10-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.4.10-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.4.10/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.4.10/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.4.10/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.4.10/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.4.11/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.11/Dockerfile index 41a2e1710..4359b9788 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.11/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.4.11/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.11/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.4.11/Dockerfile.jdk8 index 72eb6178e..b090841c2 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.11/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.4.11/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.11/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.4.11/docker-compose.yml index e07873770..a046c71de 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.11/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.4.11/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.4.11" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.4.11-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.4.11-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.4.11/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.4.11/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.4.11/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.4.11/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.4.12/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.12/Dockerfile index 41a2e1710..ec79d1b11 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.12/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.4.12/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.12 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.12/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.4.12/Dockerfile.jdk8 index 72eb6178e..644787ca6 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.12/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.4.12/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.12 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.12/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.4.12/docker-compose.yml index e07873770..1ba4c4dec 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.12/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.4.12/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.4.12" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.4.12-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.4.12-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.4.12/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.4.12/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.4.12/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.4.12/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.4.13/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.13/Dockerfile index 41a2e1710..b87c4f163 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.13/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.4.13/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.13 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.13/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.4.13/Dockerfile.jdk8 index 72eb6178e..fe4031a8e 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.13/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.4.13/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.13 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.13/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.4.13/docker-compose.yml index e07873770..3f7ebb30b 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.13/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.4.13/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.4.13" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.4.13-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.4.13-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.4.13/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.4.13/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.4.13/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.4.13/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.4.14/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.14/Dockerfile index 41a2e1710..2125b2c74 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.14/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.4.14/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.14/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.4.14/Dockerfile.jdk8 index 72eb6178e..33df19545 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.14/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.4.14/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.14/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.4.14/docker-compose.yml index e07873770..692c90e0a 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.14/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.4.14/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.4.14" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.4.14-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.4.14-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.4.14/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.4.14/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.4.14/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.4.14/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.4.2/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.2/Dockerfile index 41a2e1710..efb84d08e 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.4.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.2/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.4.2/Dockerfile.jdk8 index 72eb6178e..bf4a17780 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.2/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.4.2/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.4.2/docker-compose.yml index e07873770..8174e3eff 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.4.2/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.4.2" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.4.2-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.4.2-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.4.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.4.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.4.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.4.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.4.3/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.3/Dockerfile index 41a2e1710..4a741eb6a 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.4.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.3/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.4.3/Dockerfile.jdk8 index 72eb6178e..50248b421 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.3/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.4.3/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.4.3/docker-compose.yml index e07873770..f05b7db21 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.4.3/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.4.3" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.4.3-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.4.3-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.4.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.4.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.4.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.4.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.4.4/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.4/Dockerfile index 41a2e1710..71948d13a 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.4.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.4/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.4.4/Dockerfile.jdk8 index 72eb6178e..bf5247622 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.4/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.4.4/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.4.4/docker-compose.yml index e07873770..10ab781b8 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.4.4/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.4.4" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.4.4-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.4.4-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.4.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.4.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.4.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.4.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.4.5/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.5/Dockerfile index 41a2e1710..9392b3006 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.4.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.5/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.4.5/Dockerfile.jdk8 index 72eb6178e..335e36553 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.5/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.4.5/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.4.5/docker-compose.yml index e07873770..c10e3a167 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.4.5/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.4.5" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.4.5-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.4.5-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.4.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.4.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.4.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.4.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.4.6/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.6/Dockerfile index 41a2e1710..3e0e4f81e 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.4.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.6/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.4.6/Dockerfile.jdk8 index 72eb6178e..f21cb5e85 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.6/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.4.6/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.4.6/docker-compose.yml index e07873770..726de7ed4 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.4.6/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.4.6" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.4.6-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.4.6-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.4.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.4.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.4.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.4.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.4.7/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.7/Dockerfile index 41a2e1710..d55186ddc 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.7/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.4.7/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.7/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.4.7/Dockerfile.jdk8 index 72eb6178e..cdff51f3a 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.7/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.4.7/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.7/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.4.7/docker-compose.yml index e07873770..7246691bc 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.7/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.4.7/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.4.7" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.4.7-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.4.7-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.4.7/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.4.7/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.4.7/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.4.7/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.4.8/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.8/Dockerfile index 41a2e1710..b3c339bb3 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.8/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.4.8/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.8/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.4.8/Dockerfile.jdk8 index 72eb6178e..d4fde24a7 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.8/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.4.8/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.8/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.4.8/docker-compose.yml index e07873770..d56b91397 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.8/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.4.8/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.4.8" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.4.8-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.4.8-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.4.8/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.4.8/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.4.8/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.4.8/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.4.9/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.9/Dockerfile index 41a2e1710..f87451d87 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.9/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.4.9/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.9/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.4.9/Dockerfile.jdk8 index 72eb6178e..62926087a 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.9/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.4.9/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4.9/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.4.9/docker-compose.yml index e07873770..6a8030030 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4.9/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.4.9/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.4.9" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.4.9-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.4.9-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.4.9/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.4.9/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.4.9/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.4.9/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/6/6.4/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4/Dockerfile index 41a2e1710..b83461057 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/6/6.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4/Dockerfile.jdk8 b/linux/ecosystem/atlassian/jira/6/6.4/Dockerfile.jdk8 index 72eb6178e..efae1045c 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4/Dockerfile.jdk8 +++ b/linux/ecosystem/atlassian/jira/6/6.4/Dockerfile.jdk8 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=6.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,15 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/6/6.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/6/6.4/docker-compose.yml index e07873770..94b8b36f9 100644 --- a/linux/ecosystem/atlassian/jira/6/6.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/6/6.4/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:6.4" + build: + context: . + app-jdk7: + image: "epicmorg/jira:6.4-jdk7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk8: - image: "epicmorg/jira:${RELEASE}-jdk8" + image: "epicmorg/jira:6.4-jdk8" build: context: . dockerfile: Dockerfile.jdk8 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/6/6.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/6/6.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/6/6.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/6/6.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.0.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.0.0/Dockerfile index d3d23294c..c6caf6d42 100644 --- a/linux/ecosystem/atlassian/jira/7/7.0.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.0.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.0.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.0.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.0.0/docker-compose.yml index 21b322779..efa8a4582 100644 --- a/linux/ecosystem/atlassian/jira/7/7.0.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.0.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.0.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.0.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.0.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.0.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.0.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.0.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.0.10/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.0.10/Dockerfile index d3d23294c..8d42d16e3 100644 --- a/linux/ecosystem/atlassian/jira/7/7.0.10/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.0.10/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.0.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.0.10/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.0.10/docker-compose.yml index 21b322779..c00c0e5d6 100644 --- a/linux/ecosystem/atlassian/jira/7/7.0.10/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.0.10/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.0.10" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.0.10-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.0.10/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.0.10/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.0.10/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.0.10/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.0.11/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.0.11/Dockerfile index d3d23294c..03318cd42 100644 --- a/linux/ecosystem/atlassian/jira/7/7.0.11/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.0.11/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.0.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.0.11/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.0.11/docker-compose.yml index 21b322779..4afe55a5e 100644 --- a/linux/ecosystem/atlassian/jira/7/7.0.11/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.0.11/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.0.11" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.0.11-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.0.11/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.0.11/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.0.11/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.0.11/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.0.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.0.2/Dockerfile index d3d23294c..02db35770 100644 --- a/linux/ecosystem/atlassian/jira/7/7.0.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.0.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.0.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.0.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.0.2/docker-compose.yml index 21b322779..19a6e0e60 100644 --- a/linux/ecosystem/atlassian/jira/7/7.0.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.0.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.0.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.0.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.0.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.0.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.0.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.0.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.0.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.0.4/Dockerfile index d3d23294c..a96d58569 100644 --- a/linux/ecosystem/atlassian/jira/7/7.0.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.0.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.0.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.0.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.0.4/docker-compose.yml index 21b322779..c7a90b191 100644 --- a/linux/ecosystem/atlassian/jira/7/7.0.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.0.4/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.0.4" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.0.4-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.0.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.0.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.0.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.0.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.0.5/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.0.5/Dockerfile index d3d23294c..05e750146 100644 --- a/linux/ecosystem/atlassian/jira/7/7.0.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.0.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.0.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.0.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.0.5/docker-compose.yml index 21b322779..75ea3bded 100644 --- a/linux/ecosystem/atlassian/jira/7/7.0.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.0.5/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.0.5" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.0.5-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.0.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.0.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.0.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.0.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.1.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.0/Dockerfile index d3d23294c..bd03fa2b0 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.1.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.1.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.1.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.1.0/docker-compose.yml index 21b322779..9717d4588 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.1.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.1.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.1.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.1.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.1.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.1.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.1.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.1.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.1/Dockerfile index d3d23294c..b1fe935c6 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.1.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.1.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.1.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.1.1/docker-compose.yml index 21b322779..0b95c28d7 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.1.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.1.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.1.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.1.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.1.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.1.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.1.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.1.10/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.10/Dockerfile index d3d23294c..8cc93573b 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.10/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.1.10/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.1.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.1.10/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.1.10/docker-compose.yml index 21b322779..c34b41fd0 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.10/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.1.10/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.1.10" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.1.10-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.1.10/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.1.10/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.1.10/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.1.10/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.1.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.2/Dockerfile index d3d23294c..8f1e7e080 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.1.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.1.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.1.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.1.2/docker-compose.yml index 21b322779..9f91adc9f 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.1.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.1.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.1.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.1.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.1.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.1.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.1.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.1.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.4/Dockerfile index d3d23294c..c7eaa0401 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.1.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.1.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.1.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.1.4/docker-compose.yml index 21b322779..f169fd869 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.1.4/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.1.4" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.1.4-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.1.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.1.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.1.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.1.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.1.6/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.6/Dockerfile index d3d23294c..f60a154c7 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.1.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.1.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.1.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.1.6/docker-compose.yml index 21b322779..19fc28403 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.1.6/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.1.6" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.1.6-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.1.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.1.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.1.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.1.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.1.7/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.7/Dockerfile index d3d23294c..f48cf6b3c 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.7/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.1.7/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.1.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.1.7/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.1.7/docker-compose.yml index 21b322779..e3350a039 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.7/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.1.7/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.1.7" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.1.7-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.1.7/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.1.7/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.1.7/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.1.7/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.1.8/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.8/Dockerfile index d3d23294c..57dfe0d68 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.8/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.1.8/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.1.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.1.8/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.1.8/docker-compose.yml index 21b322779..ebe2068d8 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.8/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.1.8/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.1.8" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.1.8-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.1.8/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.1.8/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.1.8/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.1.8/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.1.9/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.9/Dockerfile index d3d23294c..051f1bdf4 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.9/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.1.9/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.1.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.1.9/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.1.9/docker-compose.yml index 21b322779..e9a75aa5d 100644 --- a/linux/ecosystem/atlassian/jira/7/7.1.9/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.1.9/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.1.9" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.1.9-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.1.9/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.1.9/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.1.9/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.1.9/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.10.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.10.0/Dockerfile index d3d23294c..822f0d38f 100644 --- a/linux/ecosystem/atlassian/jira/7/7.10.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.10.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.10.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.10.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.10.0/docker-compose.yml index 21b322779..bc4f2396b 100644 --- a/linux/ecosystem/atlassian/jira/7/7.10.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.10.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.10.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.10.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.10.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.10.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.10.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.10.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.10.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.10.1/Dockerfile index d3d23294c..a5fc12c27 100644 --- a/linux/ecosystem/atlassian/jira/7/7.10.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.10.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.10.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.10.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.10.1/docker-compose.yml index 21b322779..b899d702c 100644 --- a/linux/ecosystem/atlassian/jira/7/7.10.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.10.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.10.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.10.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.10.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.10.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.10.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.10.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.10.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.10.2/Dockerfile index d3d23294c..3d8c0d28b 100644 --- a/linux/ecosystem/atlassian/jira/7/7.10.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.10.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.10.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.10.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.10.2/docker-compose.yml index 21b322779..24762cb50 100644 --- a/linux/ecosystem/atlassian/jira/7/7.10.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.10.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.10.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.10.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.10.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.10.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.10.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.10.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.11.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.11.0/Dockerfile index d3d23294c..a53d1b0ce 100644 --- a/linux/ecosystem/atlassian/jira/7/7.11.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.11.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.11.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.11.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.11.0/docker-compose.yml index 21b322779..f2e12064d 100644 --- a/linux/ecosystem/atlassian/jira/7/7.11.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.11.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.11.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.11.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.11.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.11.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.11.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.11.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.11.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.11.1/Dockerfile index d3d23294c..4eb26fd58 100644 --- a/linux/ecosystem/atlassian/jira/7/7.11.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.11.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.11.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.11.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.11.1/docker-compose.yml index 21b322779..c1e048127 100644 --- a/linux/ecosystem/atlassian/jira/7/7.11.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.11.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.11.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.11.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.11.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.11.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.11.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.11.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.11.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.11.2/Dockerfile index d3d23294c..e20a4be91 100644 --- a/linux/ecosystem/atlassian/jira/7/7.11.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.11.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.11.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.11.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.11.2/docker-compose.yml index 21b322779..8a6a56c6a 100644 --- a/linux/ecosystem/atlassian/jira/7/7.11.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.11.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.11.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.11.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.11.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.11.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.11.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.11.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.12.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.12.0/Dockerfile index d3d23294c..7b52813ef 100644 --- a/linux/ecosystem/atlassian/jira/7/7.12.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.12.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.12.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.12.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.12.0/docker-compose.yml index 21b322779..dfa3be467 100644 --- a/linux/ecosystem/atlassian/jira/7/7.12.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.12.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.12.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.12.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.12.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.12.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.12.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.12.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.12.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.12.1/Dockerfile index d3d23294c..04818d1f0 100644 --- a/linux/ecosystem/atlassian/jira/7/7.12.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.12.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.12.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.12.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.12.1/docker-compose.yml index 21b322779..5e78d96bf 100644 --- a/linux/ecosystem/atlassian/jira/7/7.12.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.12.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.12.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.12.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.12.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.12.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.12.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.12.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.12.3/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.12.3/Dockerfile index d3d23294c..b4b4b94bb 100644 --- a/linux/ecosystem/atlassian/jira/7/7.12.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.12.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.12.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.12.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.12.3/docker-compose.yml index 21b322779..9548b53d4 100644 --- a/linux/ecosystem/atlassian/jira/7/7.12.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.12.3/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.12.3" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.12.3-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.12.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.12.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.12.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.12.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.13.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.0/Dockerfile index d3d23294c..ffa253d41 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.13.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.13.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.13.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.13.0/docker-compose.yml index 21b322779..461c4bb68 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.13.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.13.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.13.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.13.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.13.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.13.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.13.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.13.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.1/Dockerfile index d3d23294c..bf8b74951 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.13.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.13.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.13.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.13.1/docker-compose.yml index 21b322779..ddcc52571 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.13.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.13.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.13.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.13.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.13.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.13.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.13.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.13.11/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.11/Dockerfile index d3d23294c..94afb6313 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.11/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.13.11/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.13.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.13.11/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.13.11/docker-compose.yml index 21b322779..e7aef4644 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.11/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.13.11/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.13.11" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.13.11-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.13.11/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.13.11/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.13.11/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.13.11/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.13.12/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.12/Dockerfile index d3d23294c..fa2c2c780 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.12/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.13.12/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.13.12 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.13.12/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.13.12/docker-compose.yml index 21b322779..d30b5e5fb 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.12/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.13.12/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.13.12" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.13.12-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.13.12/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.13.12/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.13.12/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.13.12/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.13.13/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.13/Dockerfile index d3d23294c..0baec7a95 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.13/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.13.13/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.13.13 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.13.13/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.13.13/docker-compose.yml index 21b322779..f20635fef 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.13/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.13.13/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.13.13" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.13.13-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.13.13/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.13.13/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.13.13/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.13.13/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.13.14/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.14/Dockerfile index d3d23294c..52d77412e 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.14/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.13.14/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.13.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.13.14/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.13.14/docker-compose.yml index 21b322779..17bdf9f76 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.14/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.13.14/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.13.14" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.13.14-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.13.14/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.13.14/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.13.14/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.13.14/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.13.15/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.15/Dockerfile index d3d23294c..59bb7b517 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.15/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.13.15/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.13.15 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.13.15/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.13.15/docker-compose.yml index 21b322779..ae1f1c4a7 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.15/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.13.15/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.13.15" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.13.15-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.13.15/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.13.15/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.13.15/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.13.15/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.13.16/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.16/Dockerfile index d3d23294c..d65f4c052 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.16/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.13.16/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.13.16 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.13.16/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.13.16/docker-compose.yml index 21b322779..0376595d9 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.16/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.13.16/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.13.16" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.13.16-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.13.16/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.13.16/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.13.16/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.13.16/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.13.17/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.17/Dockerfile index d3d23294c..c0bc6797e 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.17/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.13.17/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.13.17 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.13.17/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.13.17/docker-compose.yml index 21b322779..02b504d06 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.17/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.13.17/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.13.17" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.13.17-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.13.17/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.13.17/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.13.17/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.13.17/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.13.18/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.18/Dockerfile index d3d23294c..366a7a07c 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.18/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.13.18/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.13.18 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.13.18/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.13.18/docker-compose.yml index 21b322779..6bcf57d15 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.18/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.13.18/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.13.18" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.13.18-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.13.18/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.13.18/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.13.18/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.13.18/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.13.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.2/Dockerfile index d3d23294c..f349226ab 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.13.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.13.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.13.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.13.2/docker-compose.yml index 21b322779..327b1411b 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.13.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.13.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.13.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.13.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.13.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.13.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.13.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.13.3/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.3/Dockerfile index d3d23294c..ade7ad032 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.13.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.13.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.13.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.13.3/docker-compose.yml index 21b322779..80a2ff750 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.13.3/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.13.3" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.13.3-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.13.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.13.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.13.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.13.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.13.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.4/Dockerfile index d3d23294c..e4200819b 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.13.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.13.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.13.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.13.4/docker-compose.yml index 21b322779..30148d274 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.13.4/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.13.4" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.13.4-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.13.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.13.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.13.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.13.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.13.5/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.5/Dockerfile index d3d23294c..2030f4ac5 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.13.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.13.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.13.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.13.5/docker-compose.yml index 21b322779..700d7424f 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.13.5/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.13.5" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.13.5-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.13.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.13.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.13.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.13.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.13.6/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.6/Dockerfile index d3d23294c..2c1fa4d60 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.13.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.13.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.13.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.13.6/docker-compose.yml index 21b322779..9f30bcad2 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.13.6/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.13.6" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.13.6-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.13.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.13.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.13.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.13.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.13.8/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.8/Dockerfile index d3d23294c..030fb1361 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.8/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.13.8/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.13.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.13.8/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.13.8/docker-compose.yml index 21b322779..883e05fe9 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.8/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.13.8/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.13.8" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.13.8-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.13.8/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.13.8/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.13.8/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.13.8/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.13.9/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.9/Dockerfile index d3d23294c..6b493d515 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.9/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.13.9/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.13.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.13.9/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.13.9/docker-compose.yml index 21b322779..ce7e61345 100644 --- a/linux/ecosystem/atlassian/jira/7/7.13.9/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.13.9/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.13.9" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.13.9-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.13.9/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.13.9/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.13.9/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.13.9/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.2.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.0/Dockerfile index d3d23294c..95073d06e 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.2.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.2.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.2.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.2.0/docker-compose.yml index 21b322779..547e0a100 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.2.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.2.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.2.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.2.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.2.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.2.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.2.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.2.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.1/Dockerfile index d3d23294c..1602ab824 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.2.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.2.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.2.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.2.1/docker-compose.yml index 21b322779..83bfb3c97 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.2.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.2.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.2.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.2.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.2.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.2.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.2.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.2.10/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.10/Dockerfile index d3d23294c..3a263c337 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.10/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.2.10/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.2.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.2.10/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.2.10/docker-compose.yml index 21b322779..2cbd51912 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.10/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.2.10/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.2.10" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.2.10-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.2.10/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.2.10/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.2.10/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.2.10/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.2.11/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.11/Dockerfile index d3d23294c..f20acd552 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.11/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.2.11/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.2.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.2.11/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.2.11/docker-compose.yml index 21b322779..96466f3ba 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.11/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.2.11/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.2.11" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.2.11-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.2.11/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.2.11/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.2.11/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.2.11/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.2.12/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.12/Dockerfile index d3d23294c..9e8ce13fa 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.12/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.2.12/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.2.12 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.2.12/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.2.12/docker-compose.yml index 21b322779..1990a64a1 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.12/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.2.12/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.2.12" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.2.12-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.2.12/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.2.12/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.2.12/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.2.12/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.2.13/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.13/Dockerfile index d3d23294c..9db036e80 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.13/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.2.13/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.2.13 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.2.13/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.2.13/docker-compose.yml index 21b322779..8541f8665 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.13/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.2.13/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.2.13" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.2.13-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.2.13/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.2.13/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.2.13/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.2.13/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.2.14/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.14/Dockerfile index d3d23294c..0239a3410 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.14/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.2.14/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.2.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.2.14/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.2.14/docker-compose.yml index 21b322779..347df9a3b 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.14/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.2.14/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.2.14" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.2.14-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.2.14/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.2.14/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.2.14/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.2.14/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.2.15/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.15/Dockerfile index d3d23294c..0fd649640 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.15/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.2.15/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.2.15 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.2.15/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.2.15/docker-compose.yml index 21b322779..06692ef08 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.15/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.2.15/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.2.15" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.2.15-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.2.15/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.2.15/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.2.15/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.2.15/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.2.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.2/Dockerfile index d3d23294c..65696924f 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.2.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.2.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.2.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.2.2/docker-compose.yml index 21b322779..cff22a4cc 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.2.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.2.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.2.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.2.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.2.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.2.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.2.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.2.3/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.3/Dockerfile index d3d23294c..9007fb103 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.2.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.2.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.2.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.2.3/docker-compose.yml index 21b322779..49b147dc4 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.2.3/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.2.3" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.2.3-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.2.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.2.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.2.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.2.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.2.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.4/Dockerfile index d3d23294c..fb69e92e7 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.2.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.2.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.2.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.2.4/docker-compose.yml index 21b322779..89700ec4e 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.2.4/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.2.4" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.2.4-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.2.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.2.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.2.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.2.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.2.6/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.6/Dockerfile index d3d23294c..0005013e0 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.2.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.2.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.2.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.2.6/docker-compose.yml index 21b322779..dafab60e2 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.2.6/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.2.6" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.2.6-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.2.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.2.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.2.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.2.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.2.7/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.7/Dockerfile index d3d23294c..9d0150826 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.7/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.2.7/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.2.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.2.7/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.2.7/docker-compose.yml index 21b322779..29efe17b0 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.7/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.2.7/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.2.7" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.2.7-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.2.7/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.2.7/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.2.7/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.2.7/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.2.8/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.8/Dockerfile index d3d23294c..06fa2f21e 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.8/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.2.8/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.2.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.2.8/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.2.8/docker-compose.yml index 21b322779..4975c270e 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.8/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.2.8/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.2.8" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.2.8-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.2.8/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.2.8/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.2.8/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.2.8/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.2.9/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.9/Dockerfile index d3d23294c..cd92eb4a3 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.9/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.2.9/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.2.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.2.9/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.2.9/docker-compose.yml index 21b322779..30c6b13ee 100644 --- a/linux/ecosystem/atlassian/jira/7/7.2.9/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.2.9/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.2.9" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.2.9-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.2.9/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.2.9/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.2.9/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.2.9/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.3.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.0/Dockerfile index d3d23294c..047de2377 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.3.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.3.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.3.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.3.0/docker-compose.yml index 21b322779..92f434058 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.3.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.3.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.3.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.3.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.3.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.3.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.3.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.3.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.1/Dockerfile index d3d23294c..446c93a09 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.3.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.3.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.3.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.3.1/docker-compose.yml index 21b322779..b2d48c9c6 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.3.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.3.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.3.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.3.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.3.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.3.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.3.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.3.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.2/Dockerfile index d3d23294c..c0d384f29 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.3.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.3.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.3.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.3.2/docker-compose.yml index 21b322779..153701ca0 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.3.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.3.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.3.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.3.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.3.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.3.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.3.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.3.3/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.3/Dockerfile index d3d23294c..dc244a476 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.3.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.3.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.3.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.3.3/docker-compose.yml index 21b322779..1b19bd467 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.3.3/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.3.3" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.3.3-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.3.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.3.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.3.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.3.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.3.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.4/Dockerfile index d3d23294c..1ee3b4b97 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.3.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.3.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.3.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.3.4/docker-compose.yml index 21b322779..96e572f37 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.3.4/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.3.4" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.3.4-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.3.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.3.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.3.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.3.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.3.5/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.5/Dockerfile index d3d23294c..f19cc2598 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.3.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.3.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.3.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.3.5/docker-compose.yml index 21b322779..d845e8cb9 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.3.5/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.3.5" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.3.5-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.3.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.3.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.3.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.3.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.3.6/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.6/Dockerfile index d3d23294c..7fea0b8ca 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.3.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.3.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.3.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.3.6/docker-compose.yml index 21b322779..1e79b0348 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.3.6/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.3.6" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.3.6-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.3.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.3.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.3.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.3.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.3.7/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.7/Dockerfile index d3d23294c..a0fac2234 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.7/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.3.7/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.3.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.3.7/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.3.7/docker-compose.yml index 21b322779..3cf90e37c 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.7/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.3.7/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.3.7" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.3.7-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.3.7/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.3.7/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.3.7/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.3.7/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.3.8/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.8/Dockerfile index d3d23294c..ed2d78d85 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.8/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.3.8/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.3.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.3.8/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.3.8/docker-compose.yml index 21b322779..93350fd6b 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.8/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.3.8/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.3.8" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.3.8-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.3.8/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.3.8/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.3.8/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.3.8/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.3.9/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.9/Dockerfile index d3d23294c..a6e4eff22 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.9/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.3.9/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.3.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.3.9/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.3.9/docker-compose.yml index 21b322779..9914e47a2 100644 --- a/linux/ecosystem/atlassian/jira/7/7.3.9/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.3.9/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.3.9" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.3.9-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.3.9/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.3.9/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.3.9/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.3.9/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.4.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.4.0/Dockerfile index d3d23294c..a2014ee7e 100644 --- a/linux/ecosystem/atlassian/jira/7/7.4.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.4.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.4.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.4.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.4.0/docker-compose.yml index 21b322779..b67cfb94b 100644 --- a/linux/ecosystem/atlassian/jira/7/7.4.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.4.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.4.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.4.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.4.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.4.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.4.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.4.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.4.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.4.1/Dockerfile index d3d23294c..a9b1f1864 100644 --- a/linux/ecosystem/atlassian/jira/7/7.4.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.4.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.4.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.4.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.4.1/docker-compose.yml index 21b322779..f884ca028 100644 --- a/linux/ecosystem/atlassian/jira/7/7.4.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.4.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.4.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.4.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.4.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.4.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.4.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.4.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.4.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.4.2/Dockerfile index d3d23294c..7c3c74c0b 100644 --- a/linux/ecosystem/atlassian/jira/7/7.4.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.4.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.4.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.4.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.4.2/docker-compose.yml index 21b322779..cf0699cab 100644 --- a/linux/ecosystem/atlassian/jira/7/7.4.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.4.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.4.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.4.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.4.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.4.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.4.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.4.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.4.3/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.4.3/Dockerfile index d3d23294c..df6c2b3ae 100644 --- a/linux/ecosystem/atlassian/jira/7/7.4.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.4.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.4.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.4.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.4.3/docker-compose.yml index 21b322779..62c01c133 100644 --- a/linux/ecosystem/atlassian/jira/7/7.4.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.4.3/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.4.3" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.4.3-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.4.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.4.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.4.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.4.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.4.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.4.4/Dockerfile index d3d23294c..4f6665044 100644 --- a/linux/ecosystem/atlassian/jira/7/7.4.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.4.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.4.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.4.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.4.4/docker-compose.yml index 21b322779..d05334c50 100644 --- a/linux/ecosystem/atlassian/jira/7/7.4.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.4.4/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.4.4" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.4.4-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.4.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.4.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.4.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.4.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.4.5/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.4.5/Dockerfile index d3d23294c..e7fb356cd 100644 --- a/linux/ecosystem/atlassian/jira/7/7.4.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.4.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.4.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.4.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.4.5/docker-compose.yml index 21b322779..c03221d15 100644 --- a/linux/ecosystem/atlassian/jira/7/7.4.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.4.5/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.4.5" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.4.5-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.4.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.4.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.4.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.4.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.4.6/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.4.6/Dockerfile index d3d23294c..60928884c 100644 --- a/linux/ecosystem/atlassian/jira/7/7.4.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.4.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.4.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.4.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.4.6/docker-compose.yml index 21b322779..8bdc276c0 100644 --- a/linux/ecosystem/atlassian/jira/7/7.4.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.4.6/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.4.6" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.4.6-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.4.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.4.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.4.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.4.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.5.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.5.0/Dockerfile index d3d23294c..fc94fe5a2 100644 --- a/linux/ecosystem/atlassian/jira/7/7.5.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.5.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.5.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.5.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.5.0/docker-compose.yml index 21b322779..c30c98809 100644 --- a/linux/ecosystem/atlassian/jira/7/7.5.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.5.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.5.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.5.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.5.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.5.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.5.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.5.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.5.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.5.1/Dockerfile index d3d23294c..c0e55ee1f 100644 --- a/linux/ecosystem/atlassian/jira/7/7.5.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.5.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.5.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.5.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.5.1/docker-compose.yml index 21b322779..6823dec37 100644 --- a/linux/ecosystem/atlassian/jira/7/7.5.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.5.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.5.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.5.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.5.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.5.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.5.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.5.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.5.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.5.2/Dockerfile index d3d23294c..306bbba00 100644 --- a/linux/ecosystem/atlassian/jira/7/7.5.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.5.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.5.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.5.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.5.2/docker-compose.yml index 21b322779..f75ac7985 100644 --- a/linux/ecosystem/atlassian/jira/7/7.5.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.5.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.5.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.5.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.5.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.5.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.5.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.5.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.5.3/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.5.3/Dockerfile index d3d23294c..67d93b72a 100644 --- a/linux/ecosystem/atlassian/jira/7/7.5.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.5.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.5.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.5.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.5.3/docker-compose.yml index 21b322779..9ed278132 100644 --- a/linux/ecosystem/atlassian/jira/7/7.5.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.5.3/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.5.3" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.5.3-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.5.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.5.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.5.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.5.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.5.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.5.4/Dockerfile index d3d23294c..0776908f0 100644 --- a/linux/ecosystem/atlassian/jira/7/7.5.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.5.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.5.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.5.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.5.4/docker-compose.yml index 21b322779..a0d2d5a33 100644 --- a/linux/ecosystem/atlassian/jira/7/7.5.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.5.4/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.5.4" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.5.4-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.5.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.5.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.5.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.5.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.6.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.0/Dockerfile index d3d23294c..8cd3841e1 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.6.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.6.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.6.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.6.0/docker-compose.yml index 21b322779..724f6d6a7 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.6.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.6.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.6.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.6.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.6.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.6.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.6.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.6.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.1/Dockerfile index d3d23294c..969055e6c 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.6.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.6.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.6.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.6.1/docker-compose.yml index 21b322779..77d59436b 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.6.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.6.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.6.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.6.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.6.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.6.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.6.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.6.10/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.10/Dockerfile index d3d23294c..887ac3eea 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.10/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.6.10/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.6.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.6.10/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.6.10/docker-compose.yml index 21b322779..f2298e12d 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.10/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.6.10/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.6.10" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.6.10-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.6.10/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.6.10/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.6.10/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.6.10/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.6.11/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.11/Dockerfile index d3d23294c..b1418cedf 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.11/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.6.11/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.6.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.6.11/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.6.11/docker-compose.yml index 21b322779..4ca103502 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.11/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.6.11/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.6.11" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.6.11-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.6.11/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.6.11/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.6.11/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.6.11/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.6.12/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.12/Dockerfile index d3d23294c..2b1400687 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.12/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.6.12/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.6.12 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.6.12/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.6.12/docker-compose.yml index 21b322779..f587e0548 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.12/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.6.12/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.6.12" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.6.12-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.6.12/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.6.12/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.6.12/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.6.12/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.6.13/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.13/Dockerfile index d3d23294c..35d443fe8 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.13/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.6.13/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.6.13 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.6.13/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.6.13/docker-compose.yml index 21b322779..8bc663fd7 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.13/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.6.13/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.6.13" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.6.13-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.6.13/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.6.13/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.6.13/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.6.13/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.6.14/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.14/Dockerfile index d3d23294c..59b707f63 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.14/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.6.14/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.6.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.6.14/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.6.14/docker-compose.yml index 21b322779..9eda859b5 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.14/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.6.14/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.6.14" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.6.14-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.6.14/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.6.14/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.6.14/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.6.14/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.6.15/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.15/Dockerfile index d3d23294c..ff9d652bb 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.15/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.6.15/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.6.15 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.6.15/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.6.15/docker-compose.yml index 21b322779..e2e5cceac 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.15/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.6.15/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.6.15" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.6.15-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.6.15/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.6.15/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.6.15/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.6.15/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.6.16/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.16/Dockerfile index d3d23294c..5fa89ed2a 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.16/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.6.16/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.6.16 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.6.16/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.6.16/docker-compose.yml index 21b322779..5fa8c59a8 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.16/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.6.16/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.6.16" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.6.16-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.6.16/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.6.16/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.6.16/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.6.16/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.6.17/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.17/Dockerfile index d3d23294c..12a8dbfad 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.17/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.6.17/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.6.17 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.6.17/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.6.17/docker-compose.yml index 21b322779..3247315b3 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.17/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.6.17/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.6.17" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.6.17-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.6.17/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.6.17/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.6.17/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.6.17/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.6.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.2/Dockerfile index d3d23294c..fc77ce3a5 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.6.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.6.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.6.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.6.2/docker-compose.yml index 21b322779..ca9f02885 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.6.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.6.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.6.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.6.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.6.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.6.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.6.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.6.3/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.3/Dockerfile index d3d23294c..b8106d833 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.6.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.6.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.6.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.6.3/docker-compose.yml index 21b322779..901d9a164 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.6.3/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.6.3" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.6.3-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.6.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.6.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.6.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.6.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.6.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.4/Dockerfile index d3d23294c..f72f7068f 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.6.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.6.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.6.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.6.4/docker-compose.yml index 21b322779..256b8e477 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.6.4/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.6.4" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.6.4-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.6.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.6.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.6.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.6.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.6.6/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.6/Dockerfile index d3d23294c..bce130a95 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.6.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.6.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.6.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.6.6/docker-compose.yml index 21b322779..7e5918104 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.6.6/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.6.6" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.6.6-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.6.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.6.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.6.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.6.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.6.7/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.7/Dockerfile index d3d23294c..ebdf38f99 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.7/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.6.7/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.6.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.6.7/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.6.7/docker-compose.yml index 21b322779..f26e958ef 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.7/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.6.7/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.6.7" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.6.7-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.6.7/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.6.7/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.6.7/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.6.7/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.6.8/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.8/Dockerfile index d3d23294c..e7a8caf2f 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.8/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.6.8/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.6.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.6.8/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.6.8/docker-compose.yml index 21b322779..1c107956e 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.8/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.6.8/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.6.8" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.6.8-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.6.8/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.6.8/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.6.8/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.6.8/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.6.9/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.9/Dockerfile index d3d23294c..1c0661544 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.9/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.6.9/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.6.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.6.9/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.6.9/docker-compose.yml index 21b322779..92bdaafc0 100644 --- a/linux/ecosystem/atlassian/jira/7/7.6.9/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.6.9/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.6.9" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.6.9-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.6.9/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.6.9/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.6.9/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.6.9/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.7.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.7.0/Dockerfile index d3d23294c..ec7800f15 100644 --- a/linux/ecosystem/atlassian/jira/7/7.7.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.7.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.7.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.7.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.7.0/docker-compose.yml index 21b322779..4092400b7 100644 --- a/linux/ecosystem/atlassian/jira/7/7.7.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.7.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.7.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.7.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.7.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.7.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.7.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.7.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.7.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.7.1/Dockerfile index d3d23294c..ce954bda1 100644 --- a/linux/ecosystem/atlassian/jira/7/7.7.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.7.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.7.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.7.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.7.1/docker-compose.yml index 21b322779..5e542533c 100644 --- a/linux/ecosystem/atlassian/jira/7/7.7.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.7.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.7.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.7.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.7.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.7.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.7.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.7.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.7.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.7.2/Dockerfile index d3d23294c..5abe73df9 100644 --- a/linux/ecosystem/atlassian/jira/7/7.7.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.7.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.7.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.7.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.7.2/docker-compose.yml index 21b322779..00677c1d2 100644 --- a/linux/ecosystem/atlassian/jira/7/7.7.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.7.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.7.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.7.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.7.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.7.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.7.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.7.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.7.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.7.4/Dockerfile index d3d23294c..c96dab34d 100644 --- a/linux/ecosystem/atlassian/jira/7/7.7.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.7.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.7.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.7.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.7.4/docker-compose.yml index 21b322779..a55792cac 100644 --- a/linux/ecosystem/atlassian/jira/7/7.7.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.7.4/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.7.4" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.7.4-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.7.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.7.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.7.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.7.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.8.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.8.0/Dockerfile index d3d23294c..4f032fa4a 100644 --- a/linux/ecosystem/atlassian/jira/7/7.8.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.8.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.8.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.8.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.8.0/docker-compose.yml index 21b322779..b93163d41 100644 --- a/linux/ecosystem/atlassian/jira/7/7.8.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.8.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.8.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.8.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.8.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.8.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.8.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.8.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.8.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.8.1/Dockerfile index d3d23294c..5bb79d4cb 100644 --- a/linux/ecosystem/atlassian/jira/7/7.8.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.8.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.8.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.8.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.8.1/docker-compose.yml index 21b322779..106c9737b 100644 --- a/linux/ecosystem/atlassian/jira/7/7.8.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.8.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.8.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.8.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.8.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.8.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.8.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.8.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.8.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.8.2/Dockerfile index d3d23294c..24222fee5 100644 --- a/linux/ecosystem/atlassian/jira/7/7.8.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.8.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.8.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.8.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.8.2/docker-compose.yml index 21b322779..e02812ebb 100644 --- a/linux/ecosystem/atlassian/jira/7/7.8.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.8.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.8.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.8.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.8.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.8.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.8.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.8.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.8.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.8.4/Dockerfile index d3d23294c..d9b9a8ec1 100644 --- a/linux/ecosystem/atlassian/jira/7/7.8.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.8.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.8.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.8.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.8.4/docker-compose.yml index 21b322779..2081b35cc 100644 --- a/linux/ecosystem/atlassian/jira/7/7.8.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.8.4/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.8.4" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.8.4-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.8.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.8.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.8.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.8.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.9.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.9.0/Dockerfile index d3d23294c..f99d360f0 100644 --- a/linux/ecosystem/atlassian/jira/7/7.9.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.9.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.9.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.9.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.9.0/docker-compose.yml index 21b322779..6366c527a 100644 --- a/linux/ecosystem/atlassian/jira/7/7.9.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.9.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.9.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.9.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.9.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.9.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.9.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.9.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/7/7.9.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.9.2/Dockerfile index d3d23294c..d7b07829e 100644 --- a/linux/ecosystem/atlassian/jira/7/7.9.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.9.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=7.9.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/7/7.9.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.9.2/docker-compose.yml index 21b322779..3ae3857a4 100644 --- a/linux/ecosystem/atlassian/jira/7/7.9.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.9.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:7.9.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:7.9.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.9.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.9.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/7/7.9.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/7/7.9.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.0.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.0.0/Dockerfile index d3d23294c..631f467c4 100644 --- a/linux/ecosystem/atlassian/jira/8/8.0.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.0.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.0.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.0.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.0.0/docker-compose.yml index 21b322779..7f7752de3 100644 --- a/linux/ecosystem/atlassian/jira/8/8.0.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.0.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.0.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:8.0.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/8/8.0.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.0.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.0.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.0.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.0.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.0.2/Dockerfile index d3d23294c..eec1376a1 100644 --- a/linux/ecosystem/atlassian/jira/8/8.0.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.0.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.0.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.0.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.0.2/docker-compose.yml index 21b322779..dca7834fc 100644 --- a/linux/ecosystem/atlassian/jira/8/8.0.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.0.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.0.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:8.0.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/8/8.0.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.0.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.0.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.0.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.0.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.0.3/Dockerfile index d3d23294c..4bd29b2dc 100644 --- a/linux/ecosystem/atlassian/jira/8/8.0.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.0.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.0.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.0.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.0.3/docker-compose.yml index 21b322779..3834f4d4d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.0.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.0.3/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.0.3" + build: + context: . + app-jdk8: + image: "epicmorg/jira:8.0.3-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/8/8.0.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.0.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.0.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.0.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.1.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.1.0/Dockerfile index d3d23294c..a51b54bfc 100644 --- a/linux/ecosystem/atlassian/jira/8/8.1.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.1.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.1.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.1.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.1.0/docker-compose.yml index 21b322779..89f13bb48 100644 --- a/linux/ecosystem/atlassian/jira/8/8.1.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.1.0/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.1.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:8.1.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/8/8.1.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.1.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.1.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.1.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.1.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.1.1/Dockerfile index d3d23294c..6b58b35fa 100644 --- a/linux/ecosystem/atlassian/jira/8/8.1.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.1.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.1.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.1.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.1.1/docker-compose.yml index 21b322779..419ae5f86 100644 --- a/linux/ecosystem/atlassian/jira/8/8.1.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.1.1/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.1.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:8.1.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/8/8.1.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.1.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.1.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.1.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.1.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.1.2/Dockerfile index d3d23294c..c6b6baec3 100644 --- a/linux/ecosystem/atlassian/jira/8/8.1.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.1.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.1.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.1.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.1.2/docker-compose.yml index 21b322779..921c5e2e8 100644 --- a/linux/ecosystem/atlassian/jira/8/8.1.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.1.2/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.1.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:8.1.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/8/8.1.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.1.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.1.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.1.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.1.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.1.3/Dockerfile index d3d23294c..0cf242239 100644 --- a/linux/ecosystem/atlassian/jira/8/8.1.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.1.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.1.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.1.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.1.3/docker-compose.yml index 21b322779..829bd9e47 100644 --- a/linux/ecosystem/atlassian/jira/8/8.1.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.1.3/docker-compose.yml @@ -1,9 +1,10 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.1.3" + build: + context: . + app-jdk8: + image: "epicmorg/jira:8.1.3-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/8/8.1.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.1.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.1.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.1.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.10.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.10.0/Dockerfile index d3d23294c..b37768159 100644 --- a/linux/ecosystem/atlassian/jira/8/8.10.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.10.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.10.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.10.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.10.0/Dockerfile.jdk11 index a1c1e41d7..0d5b25535 100644 --- a/linux/ecosystem/atlassian/jira/8/8.10.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.10.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.10.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.10.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.10.0/docker-compose.yml index 21b322779..d94c3ad2f 100644 --- a/linux/ecosystem/atlassian/jira/8/8.10.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.10.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.10.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.10.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.10.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.10.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.10.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.10.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.10.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.10.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.10.1/Dockerfile index d3d23294c..a84992f75 100644 --- a/linux/ecosystem/atlassian/jira/8/8.10.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.10.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.10.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.10.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.10.1/Dockerfile.jdk11 index a1c1e41d7..996b60cb1 100644 --- a/linux/ecosystem/atlassian/jira/8/8.10.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.10.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.10.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.10.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.10.1/docker-compose.yml index 21b322779..60e53f71d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.10.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.10.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.10.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.10.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.10.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.10.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.10.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.10.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.10.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.11.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.11.0/Dockerfile index d3d23294c..39a88fb36 100644 --- a/linux/ecosystem/atlassian/jira/8/8.11.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.11.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.11.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.11.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.11.0/Dockerfile.jdk11 index a1c1e41d7..dd0c84e81 100644 --- a/linux/ecosystem/atlassian/jira/8/8.11.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.11.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.11.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.11.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.11.0/docker-compose.yml index 21b322779..b75e8b584 100644 --- a/linux/ecosystem/atlassian/jira/8/8.11.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.11.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.11.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.11.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.11.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.11.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.11.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.11.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.11.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.11.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.11.1/Dockerfile index d3d23294c..a42e16c20 100644 --- a/linux/ecosystem/atlassian/jira/8/8.11.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.11.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.11.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.11.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.11.1/Dockerfile.jdk11 index a1c1e41d7..002052b11 100644 --- a/linux/ecosystem/atlassian/jira/8/8.11.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.11.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.11.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.11.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.11.1/docker-compose.yml index 21b322779..1f74e3fd9 100644 --- a/linux/ecosystem/atlassian/jira/8/8.11.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.11.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.11.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.11.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.11.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.11.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.11.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.11.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.11.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.12.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.12.0/Dockerfile index d3d23294c..4f74811de 100644 --- a/linux/ecosystem/atlassian/jira/8/8.12.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.12.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.12.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.12.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.12.0/Dockerfile.jdk11 index a1c1e41d7..308d043c1 100644 --- a/linux/ecosystem/atlassian/jira/8/8.12.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.12.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.12.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.12.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.12.0/docker-compose.yml index 21b322779..14da4d6f4 100644 --- a/linux/ecosystem/atlassian/jira/8/8.12.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.12.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.12.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.12.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.12.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.12.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.12.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.12.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.12.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.12.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.12.1/Dockerfile index d3d23294c..571b6c0f8 100644 --- a/linux/ecosystem/atlassian/jira/8/8.12.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.12.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.12.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.12.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.12.1/Dockerfile.jdk11 index a1c1e41d7..dddb7d78d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.12.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.12.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.12.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.12.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.12.1/docker-compose.yml index 21b322779..67cf010c0 100644 --- a/linux/ecosystem/atlassian/jira/8/8.12.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.12.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.12.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.12.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.12.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.12.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.12.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.12.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.12.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.12.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.12.2/Dockerfile index d3d23294c..1330b4af5 100644 --- a/linux/ecosystem/atlassian/jira/8/8.12.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.12.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.12.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.12.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.12.2/Dockerfile.jdk11 index a1c1e41d7..fe4f03f75 100644 --- a/linux/ecosystem/atlassian/jira/8/8.12.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.12.2/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.12.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.12.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.12.2/docker-compose.yml index 21b322779..6882f2b29 100644 --- a/linux/ecosystem/atlassian/jira/8/8.12.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.12.2/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.12.2" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.12.2-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.12.2-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.12.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.12.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.12.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.12.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.12.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.12.3/Dockerfile index d3d23294c..929f57197 100644 --- a/linux/ecosystem/atlassian/jira/8/8.12.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.12.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.12.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.12.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.12.3/Dockerfile.jdk11 index a1c1e41d7..afd7fd5d9 100644 --- a/linux/ecosystem/atlassian/jira/8/8.12.3/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.12.3/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.12.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.12.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.12.3/docker-compose.yml index 21b322779..b772e0645 100644 --- a/linux/ecosystem/atlassian/jira/8/8.12.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.12.3/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.12.3" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.12.3-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.12.3-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.12.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.12.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.12.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.12.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.0/Dockerfile index d3d23294c..c43444da2 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.0/Dockerfile.jdk11 index a1c1e41d7..06cbe2a98 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.0/docker-compose.yml index 21b322779..65c16a6d3 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.1/Dockerfile index d3d23294c..1e2e09146 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.1/Dockerfile.jdk11 index a1c1e41d7..1794749ca 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.1/docker-compose.yml index 21b322779..4d0f5c76b 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.10/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.10/Dockerfile index d3d23294c..41d4c35b5 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.10/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.10/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.10/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.10/Dockerfile.jdk11 index a1c1e41d7..e2c17b686 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.10/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.10/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.10/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.10/docker-compose.yml index 21b322779..777895ede 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.10/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.10/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.10" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.10-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.10-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.10/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.10/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.10/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.10/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.11/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.11/Dockerfile index d3d23294c..9a27cdc64 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.11/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.11/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.11/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.11/Dockerfile.jdk11 index a1c1e41d7..8dee7bf6b 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.11/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.11/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.11/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.11/docker-compose.yml index 21b322779..7b805245f 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.11/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.11/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.11" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.11-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.11-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.11/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.11/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.11/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.11/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.12/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.12/Dockerfile index d3d23294c..62a0db46e 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.12/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.12/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.12 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.12/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.12/Dockerfile.jdk11 index a1c1e41d7..e399a27bb 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.12/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.12/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.12 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.12/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.12/docker-compose.yml index 21b322779..bdab3b467 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.12/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.12/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.12" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.12-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.12-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.12/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.12/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.12/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.12/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.13/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.13/Dockerfile index d3d23294c..558e7498d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.13/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.13/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.13 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.13/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.13/Dockerfile.jdk11 index a1c1e41d7..6e4bf1d2c 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.13/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.13/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.13 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.13/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.13/docker-compose.yml index 21b322779..1a54e87c8 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.13/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.13/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.13" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.13-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.13-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.13/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.13/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.13/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.13/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.14/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.14/Dockerfile index d3d23294c..10666c583 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.14/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.14/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.14/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.14/Dockerfile.jdk11 index a1c1e41d7..34653e0cd 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.14/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.14/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.14/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.14/docker-compose.yml index 21b322779..92ebdc216 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.14/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.14/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.14" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.14-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.14-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.14/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.14/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.14/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.14/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.15/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.15/Dockerfile index d3d23294c..564dbc1d2 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.15/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.15/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.15 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.15/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.15/Dockerfile.jdk11 index a1c1e41d7..da4bd6905 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.15/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.15/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.15 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.15/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.15/docker-compose.yml index 21b322779..172259daa 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.15/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.15/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.15" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.15-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.15-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.15/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.15/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.15/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.15/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.16/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.16/Dockerfile index d3d23294c..25a3ec2d2 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.16/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.16/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.16 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.16/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.16/Dockerfile.jdk11 index a1c1e41d7..9a3769cda 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.16/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.16/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.16 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.16/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.16/docker-compose.yml index 21b322779..9f0c185b4 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.16/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.16/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.16" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.16-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.16-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.16/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.16/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.16/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.16/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.17/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.17/Dockerfile index d3d23294c..7a280defe 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.17/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.17/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.17 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.17/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.17/Dockerfile.jdk11 index a1c1e41d7..2611e8991 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.17/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.17/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.17 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.17/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.17/docker-compose.yml index 21b322779..7d68957f5 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.17/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.17/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.17" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.17-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.17-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.17/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.17/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.17/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.17/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.18/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.18/Dockerfile index d3d23294c..39202955b 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.18/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.18/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.18 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.18/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.18/Dockerfile.jdk11 index a1c1e41d7..f831be2fb 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.18/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.18/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.18 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.18/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.18/docker-compose.yml index 21b322779..2d692bf17 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.18/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.18/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.18" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.18-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.18-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.18/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.18/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.18/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.18/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.19/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.19/Dockerfile index d3d23294c..232bf2e83 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.19/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.19/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.19 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.19/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.19/Dockerfile.jdk11 index a1c1e41d7..6c453bf37 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.19/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.19/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.19 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.19/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.19/docker-compose.yml index 21b322779..533c0c790 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.19/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.19/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.19" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.19-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.19-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.19/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.19/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.19/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.19/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.2/Dockerfile index d3d23294c..ba0f0883f 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.2/Dockerfile.jdk11 index a1c1e41d7..88e68c180 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.2/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.2/docker-compose.yml index 21b322779..df96335cf 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.2/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.2" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.2-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.2-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.20/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.20/Dockerfile index d3d23294c..f955b9199 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.20/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.20/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.20 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.20/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.20/Dockerfile.jdk11 index a1c1e41d7..e2b765908 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.20/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.20/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.20 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.20/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.20/docker-compose.yml index 21b322779..a3b78db1a 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.20/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.20/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.20" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.20-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.20-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.20/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.20/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.20/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.20/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.21/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.21/Dockerfile index d3d23294c..e69437d25 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.21/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.21/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.21 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.21/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.21/Dockerfile.jdk11 index a1c1e41d7..e130027c0 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.21/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.21/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.21 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.21/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.21/docker-compose.yml index 21b322779..8ace1917a 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.21/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.21/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.21" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.21-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.21-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.21/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.21/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.21/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.21/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.22/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.22/Dockerfile index d3d23294c..ce3649b3d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.22/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.22/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.22 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.22/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.22/Dockerfile.jdk11 index a1c1e41d7..5b000b585 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.22/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.22/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.22 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.22/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.22/docker-compose.yml index 21b322779..064c5f141 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.22/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.22/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.22" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.22-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.22-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.22/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.22/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.22/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.22/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.24/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.24/Dockerfile index d3d23294c..15d6ecd83 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.24/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.24/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.24 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.24/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.24/Dockerfile.jdk11 index a1c1e41d7..eafae19be 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.24/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.24/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.24 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.24/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.24/docker-compose.yml index 21b322779..31a0e8092 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.24/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.24/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.24" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.24-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.24-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.24/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.24/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.24/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.24/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.25/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.25/Dockerfile index d3d23294c..13231f8e5 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.25/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.25/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.25 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.25/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.25/Dockerfile.jdk11 index a1c1e41d7..984b7c031 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.25/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.25/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.25 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.25/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.25/docker-compose.yml index 21b322779..2a55661bf 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.25/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.25/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.25" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.25-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.25-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.25/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.25/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.25/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.25/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.26/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.26/Dockerfile index d3d23294c..e060f3c42 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.26/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.26/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.26 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.26/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.26/Dockerfile.jdk11 index a1c1e41d7..e3ddc2e81 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.26/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.26/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.26 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.26/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.26/docker-compose.yml index 21b322779..a9882625f 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.26/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.26/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.26" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.26-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.26-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.26/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.26/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.26/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.26/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.27/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.27/Dockerfile index d3d23294c..eda59f129 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.27/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.27/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.27 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.27/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.27/Dockerfile.jdk11 index a1c1e41d7..ea0abe1cc 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.27/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.27/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.27 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.27/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.27/docker-compose.yml index 21b322779..495cc3a3c 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.27/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.27/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.27" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.27-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.27-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.27/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.27/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.27/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.27/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.3/Dockerfile index d3d23294c..d52089443 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.3/Dockerfile.jdk11 index a1c1e41d7..ad66b4370 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.3/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.3/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.3/docker-compose.yml index 21b322779..e9176c688 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.3/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.3" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.3-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.3-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.4/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.4/Dockerfile index d3d23294c..fb7e2bb27 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.4/Dockerfile.jdk11 index a1c1e41d7..9e58af0eb 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.4/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.4/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.4/docker-compose.yml index 21b322779..f5ff4e6f8 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.4/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.4" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.4-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.4-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.5/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.5/Dockerfile index d3d23294c..d23b83a54 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.5/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.5/Dockerfile.jdk11 index a1c1e41d7..2ca991eb5 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.5/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.5/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.5/docker-compose.yml index 21b322779..8e95fafd0 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.5/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.5" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.5-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.5-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.6/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.6/Dockerfile index d3d23294c..201b6ec55 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.6/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.6/Dockerfile.jdk11 index a1c1e41d7..223968e76 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.6/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.6/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.6/docker-compose.yml index 21b322779..ead8ce02a 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.6/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.6-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.6-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.7/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.7/Dockerfile index d3d23294c..dc5e3152e 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.7/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.7/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.7/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.7/Dockerfile.jdk11 index a1c1e41d7..74498cd4f 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.7/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.7/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.7/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.7/docker-compose.yml index 21b322779..5aa91bea8 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.7/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.7/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.7-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.7-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.7/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.7/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.7/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.7/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.8/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.8/Dockerfile index d3d23294c..457264229 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.8/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.8/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.8/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.8/Dockerfile.jdk11 index a1c1e41d7..53a3cd421 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.8/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.8/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.8/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.8/docker-compose.yml index 21b322779..d650b5227 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.8/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.8/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.8-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.8-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.8/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.8/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.8/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.8/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.13.9/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.9/Dockerfile index d3d23294c..49a6d735c 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.9/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.13.9/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.13.9/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.9/Dockerfile.jdk11 index a1c1e41d7..a066269fe 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.9/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.13.9/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.13.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.13.9/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.13.9/docker-compose.yml index 21b322779..2c0e44881 100644 --- a/linux/ecosystem/atlassian/jira/8/8.13.9/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.13.9/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.13.9" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.13.9-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.13.9-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.13.9/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.13.9/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.13.9/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.13.9/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.14.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.14.0/Dockerfile index d3d23294c..eb74d70fd 100644 --- a/linux/ecosystem/atlassian/jira/8/8.14.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.14.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.14.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.14.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.14.0/Dockerfile.jdk11 index a1c1e41d7..e6c6601a6 100644 --- a/linux/ecosystem/atlassian/jira/8/8.14.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.14.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.14.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.14.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.14.0/docker-compose.yml index 21b322779..d0481007d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.14.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.14.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.14.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.14.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.14.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.14.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.14.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.14.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.14.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.14.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.14.1/Dockerfile index d3d23294c..c6ea0ac23 100644 --- a/linux/ecosystem/atlassian/jira/8/8.14.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.14.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.14.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.14.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.14.1/Dockerfile.jdk11 index a1c1e41d7..1eb0546db 100644 --- a/linux/ecosystem/atlassian/jira/8/8.14.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.14.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.14.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.14.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.14.1/docker-compose.yml index 21b322779..5d7aa0f5b 100644 --- a/linux/ecosystem/atlassian/jira/8/8.14.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.14.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.14.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.14.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.14.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.14.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.14.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.14.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.14.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.15.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.15.0/Dockerfile index d3d23294c..700dd515f 100644 --- a/linux/ecosystem/atlassian/jira/8/8.15.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.15.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.15.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.15.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.15.0/Dockerfile.jdk11 index a1c1e41d7..a2b3ebf3c 100644 --- a/linux/ecosystem/atlassian/jira/8/8.15.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.15.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.15.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.15.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.15.0/docker-compose.yml index 21b322779..8d503dc1a 100644 --- a/linux/ecosystem/atlassian/jira/8/8.15.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.15.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.15.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.15.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.15.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.15.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.15.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.15.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.15.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.15.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.15.1/Dockerfile index d3d23294c..c4907f7a2 100644 --- a/linux/ecosystem/atlassian/jira/8/8.15.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.15.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.15.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.15.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.15.1/Dockerfile.jdk11 index a1c1e41d7..a997bb050 100644 --- a/linux/ecosystem/atlassian/jira/8/8.15.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.15.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.15.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.15.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.15.1/docker-compose.yml index 21b322779..191d52aba 100644 --- a/linux/ecosystem/atlassian/jira/8/8.15.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.15.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.15.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.15.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.15.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.15.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.15.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.15.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.15.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.16.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.16.0/Dockerfile index d3d23294c..fbbbe5796 100644 --- a/linux/ecosystem/atlassian/jira/8/8.16.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.16.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.16.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.16.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.16.0/Dockerfile.jdk11 index a1c1e41d7..f0bdfdf25 100644 --- a/linux/ecosystem/atlassian/jira/8/8.16.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.16.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.16.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.16.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.16.0/docker-compose.yml index 21b322779..1398e24b0 100644 --- a/linux/ecosystem/atlassian/jira/8/8.16.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.16.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.16.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.16.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.16.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.16.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.16.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.16.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.16.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.16.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.16.1/Dockerfile index d3d23294c..696f63d80 100644 --- a/linux/ecosystem/atlassian/jira/8/8.16.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.16.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.16.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.16.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.16.1/Dockerfile.jdk11 index a1c1e41d7..7658dab7c 100644 --- a/linux/ecosystem/atlassian/jira/8/8.16.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.16.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.16.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.16.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.16.1/docker-compose.yml index 21b322779..479f0b349 100644 --- a/linux/ecosystem/atlassian/jira/8/8.16.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.16.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.16.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.16.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.16.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.16.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.16.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.16.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.16.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.16.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.16.2/Dockerfile index d3d23294c..1b8ade3c1 100644 --- a/linux/ecosystem/atlassian/jira/8/8.16.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.16.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.16.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.16.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.16.2/Dockerfile.jdk11 index a1c1e41d7..65c1ac691 100644 --- a/linux/ecosystem/atlassian/jira/8/8.16.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.16.2/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.16.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.16.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.16.2/docker-compose.yml index 21b322779..9762919bb 100644 --- a/linux/ecosystem/atlassian/jira/8/8.16.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.16.2/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.16.2" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.16.2-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.16.2-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.16.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.16.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.16.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.16.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.17.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.17.0/Dockerfile index d3d23294c..6b94e100d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.17.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.17.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.17.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.17.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.17.0/Dockerfile.jdk11 index a1c1e41d7..88e4e6942 100644 --- a/linux/ecosystem/atlassian/jira/8/8.17.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.17.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.17.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.17.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.17.0/docker-compose.yml index 21b322779..1d3bac8a4 100644 --- a/linux/ecosystem/atlassian/jira/8/8.17.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.17.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.17.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.17.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.17.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.17.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.17.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.17.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.17.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.17.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.17.1/Dockerfile index d3d23294c..04edd5dfb 100644 --- a/linux/ecosystem/atlassian/jira/8/8.17.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.17.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.17.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.17.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.17.1/Dockerfile.jdk11 index a1c1e41d7..43f03d18f 100644 --- a/linux/ecosystem/atlassian/jira/8/8.17.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.17.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.17.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.17.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.17.1/docker-compose.yml index 21b322779..5b6edd30e 100644 --- a/linux/ecosystem/atlassian/jira/8/8.17.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.17.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.17.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.17.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.17.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.17.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.17.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.17.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.17.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.18.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.18.1/Dockerfile index d3d23294c..72f79bfb6 100644 --- a/linux/ecosystem/atlassian/jira/8/8.18.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.18.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.18.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.18.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.18.1/Dockerfile.jdk11 index a1c1e41d7..08207f31b 100644 --- a/linux/ecosystem/atlassian/jira/8/8.18.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.18.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.18.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.18.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.18.1/docker-compose.yml index 21b322779..82728d580 100644 --- a/linux/ecosystem/atlassian/jira/8/8.18.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.18.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.18.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.18.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.18.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.18.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.18.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.18.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.18.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.18.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.18.2/Dockerfile index d3d23294c..8abc537ec 100644 --- a/linux/ecosystem/atlassian/jira/8/8.18.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.18.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.18.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.18.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.18.2/Dockerfile.jdk11 index a1c1e41d7..907aa748c 100644 --- a/linux/ecosystem/atlassian/jira/8/8.18.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.18.2/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.18.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.18.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.18.2/docker-compose.yml index 21b322779..d7eeb5241 100644 --- a/linux/ecosystem/atlassian/jira/8/8.18.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.18.2/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.18.2" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.18.2-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.18.2-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.18.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.18.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.18.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.18.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.19.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.19.0/Dockerfile index d3d23294c..8f9371c25 100644 --- a/linux/ecosystem/atlassian/jira/8/8.19.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.19.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.19.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.19.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.19.0/Dockerfile.jdk11 index a1c1e41d7..3d3ba6985 100644 --- a/linux/ecosystem/atlassian/jira/8/8.19.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.19.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.19.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.19.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.19.0/docker-compose.yml index 21b322779..2e4f6fbc3 100644 --- a/linux/ecosystem/atlassian/jira/8/8.19.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.19.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.19.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.19.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.19.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.19.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.19.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.19.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.19.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.19.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.19.1/Dockerfile index d3d23294c..7c578b1a4 100644 --- a/linux/ecosystem/atlassian/jira/8/8.19.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.19.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.19.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.19.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.19.1/Dockerfile.jdk11 index a1c1e41d7..e6b3cd5c9 100644 --- a/linux/ecosystem/atlassian/jira/8/8.19.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.19.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.19.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.19.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.19.1/docker-compose.yml index 21b322779..af9d1f2bc 100644 --- a/linux/ecosystem/atlassian/jira/8/8.19.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.19.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.19.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.19.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.19.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.19.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.19.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.19.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.19.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.2.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.2.0/Dockerfile index d3d23294c..67f04aff5 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.2.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.2.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.2.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.2.0/Dockerfile.jdk11 index a1c1e41d7..27371c3a0 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.2.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.2.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.2.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.2.0/docker-compose.yml index 21b322779..a239062b5 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.2.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.2.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.2.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.2.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.2.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.2.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.2.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.2.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.2.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.2.1/Dockerfile index d3d23294c..7097a73c8 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.2.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.2.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.2.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.2.1/Dockerfile.jdk11 index a1c1e41d7..77cc4a4f3 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.2.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.2.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.2.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.2.1/docker-compose.yml index 21b322779..ab5c6a23c 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.2.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.2.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.2.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.2.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.2.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.2.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.2.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.2.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.2.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.2.2/Dockerfile index d3d23294c..25903cfd8 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.2.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.2.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.2.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.2.2/Dockerfile.jdk11 index a1c1e41d7..2c52b2172 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.2.2/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.2.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.2.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.2.2/docker-compose.yml index 21b322779..fa80a3bd5 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.2.2/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.2.2" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.2.2-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.2.2-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.2.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.2.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.2.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.2.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.2.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.2.3/Dockerfile index d3d23294c..188ee9d56 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.2.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.2.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.2.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.2.3/Dockerfile.jdk11 index a1c1e41d7..b58b60a80 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.3/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.2.3/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.2.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.2.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.2.3/docker-compose.yml index 21b322779..8e31f4984 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.2.3/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.2.3" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.2.3-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.2.3-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.2.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.2.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.2.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.2.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.2.4/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.2.4/Dockerfile index d3d23294c..7c5b0ca9d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.2.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.2.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.2.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.2.4/Dockerfile.jdk11 index a1c1e41d7..7c309674a 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.4/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.2.4/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.2.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.2.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.2.4/docker-compose.yml index 21b322779..25a9d0f59 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.2.4/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.2.4" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.2.4-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.2.4-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.2.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.2.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.2.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.2.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.2.5/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.2.5/Dockerfile index d3d23294c..5ef239b60 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.2.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.2.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.2.5/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.2.5/Dockerfile.jdk11 index a1c1e41d7..e337b51db 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.5/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.2.5/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.2.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.2.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.2.5/docker-compose.yml index 21b322779..4030c3514 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.2.5/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.2.5" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.2.5-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.2.5-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.2.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.2.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.2.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.2.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.2.6/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.2.6/Dockerfile index d3d23294c..1af6402c5 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.2.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.2.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.2.6/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.2.6/Dockerfile.jdk11 index a1c1e41d7..8b3358d87 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.6/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.2.6/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.2.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.2.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.2.6/docker-compose.yml index 21b322779..8821cc3a5 100644 --- a/linux/ecosystem/atlassian/jira/8/8.2.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.2.6/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.2.6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.2.6-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.2.6-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.2.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.2.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.2.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.2.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.0/Dockerfile index d3d23294c..06dce0a92 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.0/Dockerfile.jdk11 index a1c1e41d7..4b8581280 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.0/docker-compose.yml index 21b322779..926056c8d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile index d3d23294c..868710bf5 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile.jdk11 index a1c1e41d7..31a357b2d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.1/docker-compose.yml index 21b322779..6e1756531 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.10/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.10/Dockerfile index d3d23294c..0c8fd8275 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.10/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.10/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.10/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.10/Dockerfile.jdk11 index a1c1e41d7..c6ff4df94 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.10/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.10/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.10/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.10/docker-compose.yml index 21b322779..273b0ceaa 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.10/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.10/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.10" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.10-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.10-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.10/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.10/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.10/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.10/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.11/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.11/Dockerfile index d3d23294c..6192eda63 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.11/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.11/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.11/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.11/Dockerfile.jdk11 index a1c1e41d7..e4709fb85 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.11/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.11/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.11/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.11/docker-compose.yml index 21b322779..5d6a761f9 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.11/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.11/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.11" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.11-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.11-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.11/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.11/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.11/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.11/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.12/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.12/Dockerfile index d3d23294c..3c4b9024c 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.12/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.12/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.12 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.12/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.12/Dockerfile.jdk11 index a1c1e41d7..854f84978 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.12/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.12/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.12 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.12/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.12/docker-compose.yml index 21b322779..92ae5b991 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.12/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.12/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.12" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.12-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.12-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.12/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.12/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.12/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.12/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.13/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.13/Dockerfile index d3d23294c..53e6ed1cd 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.13/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.13/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.13 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.13/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.13/Dockerfile.jdk11 index a1c1e41d7..19847750c 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.13/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.13/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.13 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.13/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.13/docker-compose.yml index 21b322779..99014e373 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.13/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.13/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.13" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.13-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.13-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.13/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.13/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.13/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.13/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.14/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.14/Dockerfile index d3d23294c..320ecfc1c 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.14/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.14/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.14/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.14/Dockerfile.jdk11 index a1c1e41d7..439bc914d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.14/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.14/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.14/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.14/docker-compose.yml index 21b322779..4d11567ec 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.14/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.14/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.14" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.14-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.14-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.14/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.14/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.14/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.14/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.15/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.15/Dockerfile index d3d23294c..f47747095 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.15/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.15/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.15 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.15/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.15/Dockerfile.jdk11 index a1c1e41d7..4b27f0efe 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.15/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.15/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.15 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.15/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.15/docker-compose.yml index 21b322779..aa79f4ce3 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.15/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.15/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.15" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.15-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.15-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.15/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.15/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.15/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.15/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.16/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.16/Dockerfile index d3d23294c..c3e678b55 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.16/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.16/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.16 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.16/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.16/Dockerfile.jdk11 index a1c1e41d7..f309b9727 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.16/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.16/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.16 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.16/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.16/docker-compose.yml index 21b322779..c8e74e050 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.16/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.16/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.16" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.16-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.16-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.16/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.16/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.16/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.16/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.17/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.17/Dockerfile index d3d23294c..60e34ce33 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.17/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.17/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.17 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.17/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.17/Dockerfile.jdk11 index a1c1e41d7..d2d0687e4 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.17/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.17/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.17 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.17/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.17/docker-compose.yml index 21b322779..98636abce 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.17/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.17/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.17" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.17-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.17-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.17/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.17/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.17/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.17/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.19/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.19/Dockerfile index d3d23294c..429c25188 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.19/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.19/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.19 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.19/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.19/Dockerfile.jdk11 index a1c1e41d7..9d6dc198c 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.19/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.19/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.19 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.19/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.19/docker-compose.yml index 21b322779..2221628c0 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.19/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.19/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.19" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.19-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.19-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.19/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.19/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.19/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.19/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.2/Dockerfile index d3d23294c..25ff73b93 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.2/Dockerfile.jdk11 index a1c1e41d7..cd88fe2f4 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.2/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.2/docker-compose.yml index 21b322779..8d6fc4735 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.2/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.2" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.2-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.2-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.20/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.20/Dockerfile index d3d23294c..f200e51eb 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.20/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.20/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.20 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.20/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.20/Dockerfile.jdk11 index a1c1e41d7..d79ac121b 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.20/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.20/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.20 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.20/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.20/docker-compose.yml index 21b322779..d0b5e8fb2 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.20/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.20/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.20" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.20-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.20-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.20/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.20/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.20/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.20/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.21/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.21/Dockerfile index d3d23294c..e1d56dd04 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.21/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.21/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.21 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.21/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.21/Dockerfile.jdk11 index a1c1e41d7..eb69873a3 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.21/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.21/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.21 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.21/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.21/docker-compose.yml index 21b322779..ace14f00c 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.21/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.21/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.21" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.21-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.21-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.21/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.21/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.21/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.21/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.22/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.22/Dockerfile index d3d23294c..e9a67ed3e 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.22/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.22/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.22 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.22/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.22/Dockerfile.jdk11 index a1c1e41d7..5e82ddde8 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.22/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.22/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.22 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.22/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.22/docker-compose.yml index 21b322779..825126cd2 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.22/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.22/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.22" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.22-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.22-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.22/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.22/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.22/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.22/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.23/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.23/Dockerfile index d3d23294c..2d57112be 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.23/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.23/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.23 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.23/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.23/Dockerfile.jdk11 index a1c1e41d7..992343749 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.23/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.23/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.23 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.23/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.23/docker-compose.yml index 21b322779..09876abc0 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.23/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.23/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.23" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.23-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.23-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.23/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.23/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.23/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.23/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.24/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.24/Dockerfile index d3d23294c..a6008860e 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.24/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.24/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.24 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.24/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.24/Dockerfile.jdk11 index a1c1e41d7..24a110c56 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.24/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.24/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.24 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.24/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.24/docker-compose.yml index 21b322779..a1e600f3e 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.24/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.24/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.24" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.24-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.24-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.24/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.24/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.24/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.24/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.25/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.25/Dockerfile index d3d23294c..d166cc405 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.25/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.25/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.25 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.25/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.25/Dockerfile.jdk11 index a1c1e41d7..43b7915f9 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.25/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.25/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.25 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.25/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.25/docker-compose.yml index 21b322779..c89dc3116 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.25/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.25/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.25" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.25-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.25-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.25/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.25/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.25/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.25/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.26/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.26/Dockerfile index d3d23294c..a76e151e4 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.26/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.26/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.26 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.26/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.26/Dockerfile.jdk11 index a1c1e41d7..c26450e65 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.26/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.26/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.26 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.26/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.26/docker-compose.yml index 21b322779..b37cdf7b7 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.26/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.26/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.26" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.26-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.26-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.26/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.26/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.26/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.26/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.27/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.27/Dockerfile index d3d23294c..aecf270d8 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.27/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.27/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.27 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.27/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.27/Dockerfile.jdk11 index a1c1e41d7..054ba0f72 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.27/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.27/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.27 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.27/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.27/docker-compose.yml index 21b322779..c93c4efde 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.27/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.27/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.27" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.27-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.27-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.27/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.27/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.27/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.27/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.28/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.28/Dockerfile index d3d23294c..265fd3017 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.28/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.28/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.28 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.28/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.28/Dockerfile.jdk11 index a1c1e41d7..c0fb5df79 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.28/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.28/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.28 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.28/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.28/docker-compose.yml index 21b322779..b66728635 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.28/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.28/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.28" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.28-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.28-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.28/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.28/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.28/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.28/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.29/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.29/Dockerfile index d3d23294c..0660a11ef 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.29/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.29/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.29 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.29/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.29/Dockerfile.jdk11 index a1c1e41d7..0a8baf76f 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.29/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.29/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.29 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.29/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.29/docker-compose.yml index 21b322779..a1352c336 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.29/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.29/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.29" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.29-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.29-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.29/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.29/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.29/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.29/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.3/Dockerfile index d3d23294c..51a89b59e 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.3/Dockerfile.jdk11 index a1c1e41d7..04cf53821 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.3/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.3/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.3/docker-compose.yml index 21b322779..4c64648f2 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.3/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.3" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.3-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.3-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.30/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.30/Dockerfile index d3d23294c..a7741d758 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.30/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.30/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.30 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.30/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.30/Dockerfile.jdk11 index a1c1e41d7..a5034a689 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.30/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.30/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.30 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.30/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.30/docker-compose.yml index 21b322779..0a9bae69f 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.30/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.30/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.30" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.30-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.30-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.30/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.30/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.30/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.30/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.4/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.4/Dockerfile index d3d23294c..621a3542b 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.4/Dockerfile.jdk11 index a1c1e41d7..0cab3bc88 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.4/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.4/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.4/docker-compose.yml index 21b322779..66e829b62 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.4/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.4" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.4-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.4-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.5/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.5/Dockerfile index d3d23294c..9eb2cfbdf 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.5/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.5/Dockerfile.jdk11 index a1c1e41d7..7d0322989 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.5/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.5/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.5/docker-compose.yml index 21b322779..1864757bb 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.5/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.5" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.5-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.5-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.6/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.6/Dockerfile index d3d23294c..af6b899c1 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.6/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.6/Dockerfile.jdk11 index a1c1e41d7..d7fd2a375 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.6/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.6/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.6/docker-compose.yml index 21b322779..3590244dd 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.6/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.6-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.6-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.7/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.7/Dockerfile index d3d23294c..a5ca4f801 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.7/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.7/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.7/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.7/Dockerfile.jdk11 index a1c1e41d7..e0f560463 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.7/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.7/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.7/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.7/docker-compose.yml index 21b322779..a238d5a95 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.7/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.7/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.7-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.7-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.7/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.7/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.7/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.7/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.8/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.8/Dockerfile index d3d23294c..e62a349d8 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.8/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.8/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.8/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.8/Dockerfile.jdk11 index a1c1e41d7..7e965fac7 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.8/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.8/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.8/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.8/docker-compose.yml index 21b322779..d10e0c0ca 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.8/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.8/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.8-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.8-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.8/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.8/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.8/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.8/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.20.9/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.9/Dockerfile index d3d23294c..2d797960b 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.9/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.20.9/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.20.9/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.9/Dockerfile.jdk11 index a1c1e41d7..88acca687 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.9/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.20.9/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.20.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.20.9/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.9/docker-compose.yml index 21b322779..474e6c56f 100644 --- a/linux/ecosystem/atlassian/jira/8/8.20.9/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.20.9/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.20.9" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.20.9-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.20.9-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.20.9/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.9/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.20.9/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.20.9/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.21.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.21.0/Dockerfile index d3d23294c..7d5c48acb 100644 --- a/linux/ecosystem/atlassian/jira/8/8.21.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.21.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.21.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.21.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.21.0/Dockerfile.jdk11 index a1c1e41d7..d974fcee7 100644 --- a/linux/ecosystem/atlassian/jira/8/8.21.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.21.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.21.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.21.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.21.0/docker-compose.yml index 21b322779..735670287 100644 --- a/linux/ecosystem/atlassian/jira/8/8.21.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.21.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.21.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.21.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.21.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.21.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.21.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.21.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.21.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.21.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.21.1/Dockerfile index d3d23294c..3f151a980 100644 --- a/linux/ecosystem/atlassian/jira/8/8.21.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.21.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.21.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.21.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.21.1/Dockerfile.jdk11 index a1c1e41d7..eb257335b 100644 --- a/linux/ecosystem/atlassian/jira/8/8.21.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.21.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.21.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.21.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.21.1/docker-compose.yml index 21b322779..97e0997fb 100644 --- a/linux/ecosystem/atlassian/jira/8/8.21.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.21.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.21.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.21.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.21.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.21.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.21.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.21.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.21.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.22.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.22.0/Dockerfile index d3d23294c..f137e7b46 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.22.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.22.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.22.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.22.0/Dockerfile.jdk11 index a1c1e41d7..1e9a34aa9 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.22.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.22.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.22.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.22.0/docker-compose.yml index 21b322779..a4f541950 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.22.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.22.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.22.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.22.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.22.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.22.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.22.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.22.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.22.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.22.1/Dockerfile index d3d23294c..1eca0e3dd 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.22.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.22.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.22.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.22.1/Dockerfile.jdk11 index a1c1e41d7..af75bf5ab 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.22.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.22.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.22.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.22.1/docker-compose.yml index 21b322779..7fa019a6d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.22.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.22.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.22.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.22.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.22.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.22.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.22.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.22.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.22.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.22.2/Dockerfile index d3d23294c..6ca0250b6 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.22.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.22.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.22.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.22.2/Dockerfile.jdk11 index a1c1e41d7..03135fe93 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.22.2/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.22.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.22.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.22.2/docker-compose.yml index 21b322779..64e27f070 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.22.2/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.22.2" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.22.2-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.22.2-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.22.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.22.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.22.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.22.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.22.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.22.3/Dockerfile index d3d23294c..ef55d01a4 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.22.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.22.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.22.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.22.3/Dockerfile.jdk11 index a1c1e41d7..d298f5bcb 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.3/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.22.3/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.22.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.22.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.22.3/docker-compose.yml index 21b322779..25c0038af 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.22.3/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.22.3" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.22.3-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.22.3-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.22.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.22.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.22.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.22.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.22.4/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.22.4/Dockerfile index d3d23294c..d1fb080f6 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.22.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.22.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.22.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.22.4/Dockerfile.jdk11 index a1c1e41d7..c25c61c1e 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.4/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.22.4/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.22.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.22.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.22.4/docker-compose.yml index 21b322779..38fce32ba 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.22.4/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.22.4" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.22.4-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.22.4-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.22.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.22.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.22.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.22.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.22.6/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.22.6/Dockerfile index d3d23294c..dd9b97e14 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.22.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.22.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.22.6/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.22.6/Dockerfile.jdk11 index a1c1e41d7..81f4d4edb 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.6/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.22.6/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.22.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.22.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.22.6/docker-compose.yml index 21b322779..8338ac7ec 100644 --- a/linux/ecosystem/atlassian/jira/8/8.22.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.22.6/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.22.6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.22.6-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.22.6-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.22.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.22.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.22.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.22.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.3.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.3.0/Dockerfile index d3d23294c..73245802a 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.3.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.3.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.3.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.3.0/Dockerfile.jdk11 index a1c1e41d7..81241c0ee 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.3.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.3.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.3.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.3.0/docker-compose.yml index 21b322779..05c6866c6 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.3.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.3.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.3.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.3.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.3.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.3.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.3.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.3.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.3.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.3.1/Dockerfile index d3d23294c..e99dacfd9 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.3.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.3.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.3.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.3.1/Dockerfile.jdk11 index a1c1e41d7..1428b65c5 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.3.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.3.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.3.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.3.1/docker-compose.yml index 21b322779..27d5f3f0f 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.3.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.3.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.3.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.3.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.3.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.3.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.3.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.3.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.3.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.3.2/Dockerfile index d3d23294c..6a6e4ab3b 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.3.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.3.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.3.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.3.2/Dockerfile.jdk11 index a1c1e41d7..a13c61954 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.3.2/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.3.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.3.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.3.2/docker-compose.yml index 21b322779..3778b7b0b 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.3.2/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.3.2" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.3.2-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.3.2-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.3.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.3.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.3.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.3.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.3.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.3.3/Dockerfile index d3d23294c..927c93e2a 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.3.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.3.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.3.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.3.3/Dockerfile.jdk11 index a1c1e41d7..9e5ad4d0e 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.3/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.3.3/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.3.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.3.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.3.3/docker-compose.yml index 21b322779..7eef91841 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.3.3/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.3.3" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.3.3-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.3.3-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.3.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.3.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.3.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.3.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.3.4/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.3.4/Dockerfile index d3d23294c..840928936 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.3.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.3.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.3.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.3.4/Dockerfile.jdk11 index a1c1e41d7..e6defce37 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.4/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.3.4/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.3.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.3.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.3.4/docker-compose.yml index 21b322779..dfc3e1a95 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.3.4/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.3.4" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.3.4-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.3.4-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.3.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.3.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.3.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.3.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.3.5/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.3.5/Dockerfile index d3d23294c..4302c5af0 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.3.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.3.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.3.5/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.3.5/Dockerfile.jdk11 index a1c1e41d7..d05c04de3 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.5/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.3.5/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.3.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.3.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.3.5/docker-compose.yml index 21b322779..ee90d9280 100644 --- a/linux/ecosystem/atlassian/jira/8/8.3.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.3.5/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.3.5" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.3.5-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.3.5-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.3.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.3.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.3.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.3.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.4.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.4.0/Dockerfile index d3d23294c..440895376 100644 --- a/linux/ecosystem/atlassian/jira/8/8.4.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.4.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.4.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.4.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.4.0/Dockerfile.jdk11 index a1c1e41d7..478e656a9 100644 --- a/linux/ecosystem/atlassian/jira/8/8.4.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.4.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.4.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.4.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.4.0/docker-compose.yml index 21b322779..013e63e2e 100644 --- a/linux/ecosystem/atlassian/jira/8/8.4.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.4.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.4.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.4.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.4.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.4.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.4.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.4.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.4.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.4.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.4.1/Dockerfile index d3d23294c..7ca876eed 100644 --- a/linux/ecosystem/atlassian/jira/8/8.4.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.4.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.4.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.4.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.4.1/Dockerfile.jdk11 index a1c1e41d7..2022026fd 100644 --- a/linux/ecosystem/atlassian/jira/8/8.4.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.4.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.4.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.4.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.4.1/docker-compose.yml index 21b322779..c13a8ffc8 100644 --- a/linux/ecosystem/atlassian/jira/8/8.4.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.4.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.4.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.4.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.4.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.4.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.4.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.4.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.4.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.4.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.4.2/Dockerfile index d3d23294c..0ae5fb78b 100644 --- a/linux/ecosystem/atlassian/jira/8/8.4.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.4.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.4.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.4.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.4.2/Dockerfile.jdk11 index a1c1e41d7..32b90106b 100644 --- a/linux/ecosystem/atlassian/jira/8/8.4.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.4.2/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.4.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.4.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.4.2/docker-compose.yml index 21b322779..fc45adfdc 100644 --- a/linux/ecosystem/atlassian/jira/8/8.4.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.4.2/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.4.2" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.4.2-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.4.2-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.4.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.4.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.4.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.4.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.4.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.4.3/Dockerfile index d3d23294c..f99b12c89 100644 --- a/linux/ecosystem/atlassian/jira/8/8.4.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.4.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.4.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.4.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.4.3/Dockerfile.jdk11 index a1c1e41d7..2470e2562 100644 --- a/linux/ecosystem/atlassian/jira/8/8.4.3/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.4.3/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.4.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.4.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.4.3/docker-compose.yml index 21b322779..09f053776 100644 --- a/linux/ecosystem/atlassian/jira/8/8.4.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.4.3/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.4.3" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.4.3-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.4.3-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.4.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.4.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.4.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.4.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.0/Dockerfile index d3d23294c..3e320aed1 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.0/Dockerfile.jdk11 index a1c1e41d7..0a5039c50 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.0/docker-compose.yml index 21b322779..86c5d086d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.1/Dockerfile index d3d23294c..1e086d8d2 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.1/Dockerfile.jdk11 index a1c1e41d7..d7e6acddc 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.1/docker-compose.yml index 21b322779..4553dbd0d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.10/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.10/Dockerfile index d3d23294c..575334c19 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.10/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.10/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.10/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.10/Dockerfile.jdk11 index a1c1e41d7..f2267b4ee 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.10/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.10/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.10/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.10/docker-compose.yml index 21b322779..30add3ad6 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.10/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.10/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.10" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.10-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.10-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.10/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.10/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.10/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.10/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.11/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.11/Dockerfile index d3d23294c..259eb3920 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.11/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.11/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.11/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.11/Dockerfile.jdk11 index a1c1e41d7..e6142f59f 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.11/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.11/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.11/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.11/docker-compose.yml index 21b322779..775617dc3 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.11/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.11/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.11" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.11-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.11-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.11/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.11/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.11/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.11/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.12/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.12/Dockerfile index d3d23294c..9edb15ced 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.12/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.12/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.12 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.12/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.12/Dockerfile.jdk11 index a1c1e41d7..b510bb459 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.12/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.12/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.12 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.12/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.12/docker-compose.yml index 21b322779..35c1b3f56 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.12/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.12/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.12" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.12-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.12-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.12/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.12/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.12/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.12/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.13/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.13/Dockerfile index d3d23294c..7989afa56 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.13/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.13/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.13 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.13/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.13/Dockerfile.jdk11 index a1c1e41d7..963e0b90c 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.13/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.13/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.13 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.13/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.13/docker-compose.yml index 21b322779..c9abb4f9a 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.13/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.13/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.13" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.13-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.13-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.13/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.13/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.13/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.13/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.14/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.14/Dockerfile index d3d23294c..11a0a75b2 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.14/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.14/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.14/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.14/Dockerfile.jdk11 index a1c1e41d7..2614de115 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.14/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.14/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.14/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.14/docker-compose.yml index 21b322779..a5ba6beb1 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.14/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.14/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.14" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.14-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.14-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.14/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.14/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.14/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.14/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.15/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.15/Dockerfile index d3d23294c..f26e03dbd 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.15/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.15/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.15 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.15/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.15/Dockerfile.jdk11 index a1c1e41d7..bf8335d6d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.15/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.15/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.15 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.15/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.15/docker-compose.yml index 21b322779..bad440553 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.15/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.15/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.15" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.15-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.15-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.15/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.15/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.15/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.15/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.16/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.16/Dockerfile index d3d23294c..bd26aa1a4 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.16/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.16/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.16 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.16/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.16/Dockerfile.jdk11 index a1c1e41d7..c9cbf937a 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.16/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.16/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.16 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.16/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.16/docker-compose.yml index 21b322779..ccd25ecad 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.16/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.16/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.16" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.16-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.16-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.16/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.16/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.16/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.16/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.17/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.17/Dockerfile index d3d23294c..bd5c91e72 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.17/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.17/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.17 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.17/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.17/Dockerfile.jdk11 index a1c1e41d7..502ec553f 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.17/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.17/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.17 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.17/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.17/docker-compose.yml index 21b322779..53397e033 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.17/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.17/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.17" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.17-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.17-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.17/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.17/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.17/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.17/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.18/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.18/Dockerfile index d3d23294c..30b93f577 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.18/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.18/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.18 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.18/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.18/Dockerfile.jdk11 index a1c1e41d7..f5ab1d332 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.18/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.18/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.18 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.18/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.18/docker-compose.yml index 21b322779..876e97a3d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.18/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.18/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.18" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.18-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.18-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.18/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.18/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.18/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.18/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.19/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.19/Dockerfile index d3d23294c..b18e09a7e 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.19/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.19/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.19 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.19/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.19/Dockerfile.jdk11 index a1c1e41d7..2bf6a1ae3 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.19/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.19/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.19 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.19/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.19/docker-compose.yml index 21b322779..5f283a47c 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.19/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.19/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.19" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.19-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.19-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.19/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.19/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.19/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.19/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.2/Dockerfile index d3d23294c..010d81556 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.2/Dockerfile.jdk11 index a1c1e41d7..07a10d1b5 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.2/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.2/docker-compose.yml index 21b322779..5df442ea9 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.2/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.2" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.2-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.2-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.3/Dockerfile index d3d23294c..429efe44c 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.3/Dockerfile.jdk11 index a1c1e41d7..ebdcab4ec 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.3/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.3/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.3/docker-compose.yml index 21b322779..1cf376b3f 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.3/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.3" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.3-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.3-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.4/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.4/Dockerfile index d3d23294c..244ae66a7 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.4/Dockerfile.jdk11 index a1c1e41d7..b4c8dec2a 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.4/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.4/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.4/docker-compose.yml index 21b322779..5efefb497 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.4/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.4" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.4-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.4-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.5/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.5/Dockerfile index d3d23294c..12c3f48ba 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.5/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.5/Dockerfile.jdk11 index a1c1e41d7..839cac7a3 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.5/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.5/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.5/docker-compose.yml index 21b322779..016bda92d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.5/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.5" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.5-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.5-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.6/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.6/Dockerfile index d3d23294c..3fd946d54 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.6/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.6/Dockerfile.jdk11 index a1c1e41d7..633890a28 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.6/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.6/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.6/docker-compose.yml index 21b322779..00e10e8aa 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.6/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.6" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.6-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.6-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.7/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.7/Dockerfile index d3d23294c..2f490cccc 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.7/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.7/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.7/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.7/Dockerfile.jdk11 index a1c1e41d7..cc67c17dc 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.7/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.7/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.7/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.7/docker-compose.yml index 21b322779..e3fb8c544 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.7/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.7/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.7" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.7-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.7-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.7/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.7/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.7/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.7/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.8/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.8/Dockerfile index d3d23294c..bf740b9bb 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.8/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.8/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.8/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.8/Dockerfile.jdk11 index a1c1e41d7..03ff10267 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.8/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.8/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.8/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.8/docker-compose.yml index 21b322779..35cd3073a 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.8/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.8/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.8-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.8-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.8/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.8/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.8/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.8/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.5.9/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.9/Dockerfile index d3d23294c..0127735e7 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.9/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.5.9/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.5.9/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.9/Dockerfile.jdk11 index a1c1e41d7..9324a914d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.9/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.5.9/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.5.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.5.9/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.5.9/docker-compose.yml index 21b322779..8b3c4ece3 100644 --- a/linux/ecosystem/atlassian/jira/8/8.5.9/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.5.9/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.5.9" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.5.9-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.5.9-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.5.9/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.5.9/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.5.9/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.5.9/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.6.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.6.0/Dockerfile index d3d23294c..24f924dca 100644 --- a/linux/ecosystem/atlassian/jira/8/8.6.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.6.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.6.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.6.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.6.0/Dockerfile.jdk11 index a1c1e41d7..a6b0b87ff 100644 --- a/linux/ecosystem/atlassian/jira/8/8.6.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.6.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.6.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.6.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.6.0/docker-compose.yml index 21b322779..d4a648ba0 100644 --- a/linux/ecosystem/atlassian/jira/8/8.6.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.6.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.6.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.6.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.6.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.6.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.6.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.6.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.6.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.6.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.6.1/Dockerfile index d3d23294c..d6751957d 100644 --- a/linux/ecosystem/atlassian/jira/8/8.6.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.6.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.6.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.6.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.6.1/Dockerfile.jdk11 index a1c1e41d7..d233660e0 100644 --- a/linux/ecosystem/atlassian/jira/8/8.6.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.6.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.6.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.6.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.6.1/docker-compose.yml index 21b322779..8bbb298ba 100644 --- a/linux/ecosystem/atlassian/jira/8/8.6.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.6.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.6.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.6.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.6.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.6.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.6.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.6.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.6.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.7.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.7.0/Dockerfile index d3d23294c..f6fdefd01 100644 --- a/linux/ecosystem/atlassian/jira/8/8.7.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.7.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.7.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.7.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.7.0/Dockerfile.jdk11 index a1c1e41d7..e6f7ad376 100644 --- a/linux/ecosystem/atlassian/jira/8/8.7.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.7.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.7.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.7.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.7.0/docker-compose.yml index 21b322779..2f2728b1b 100644 --- a/linux/ecosystem/atlassian/jira/8/8.7.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.7.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.7.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.7.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.7.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.7.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.7.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.7.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.7.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.7.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.7.1/Dockerfile index d3d23294c..15fb4c693 100644 --- a/linux/ecosystem/atlassian/jira/8/8.7.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.7.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.7.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.7.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.7.1/Dockerfile.jdk11 index a1c1e41d7..dfb754a3a 100644 --- a/linux/ecosystem/atlassian/jira/8/8.7.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.7.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.7.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.7.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.7.1/docker-compose.yml index 21b322779..93110a2e5 100644 --- a/linux/ecosystem/atlassian/jira/8/8.7.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.7.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.7.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.7.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.7.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.7.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.7.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.7.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.7.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.8.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.8.0/Dockerfile index d3d23294c..3b6094b5b 100644 --- a/linux/ecosystem/atlassian/jira/8/8.8.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.8.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.8.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.8.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.8.0/Dockerfile.jdk11 index a1c1e41d7..4a83c822a 100644 --- a/linux/ecosystem/atlassian/jira/8/8.8.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.8.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.8.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.8.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.8.0/docker-compose.yml index 21b322779..54a29c635 100644 --- a/linux/ecosystem/atlassian/jira/8/8.8.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.8.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.8.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.8.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.8.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.8.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.8.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.8.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.8.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.8.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.8.1/Dockerfile index d3d23294c..7320b780f 100644 --- a/linux/ecosystem/atlassian/jira/8/8.8.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.8.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.8.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.8.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.8.1/Dockerfile.jdk11 index a1c1e41d7..1636bc3b8 100644 --- a/linux/ecosystem/atlassian/jira/8/8.8.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.8.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.8.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.8.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.8.1/docker-compose.yml index 21b322779..26cf2d1c3 100644 --- a/linux/ecosystem/atlassian/jira/8/8.8.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.8.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.8.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.8.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.8.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.8.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.8.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.8.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.8.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.9.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.9.0/Dockerfile index d3d23294c..c6f627d87 100644 --- a/linux/ecosystem/atlassian/jira/8/8.9.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.9.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.9.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.9.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.9.0/Dockerfile.jdk11 index a1c1e41d7..af324d2fe 100644 --- a/linux/ecosystem/atlassian/jira/8/8.9.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.9.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.9.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.9.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.9.0/docker-compose.yml index 21b322779..99f28ec7e 100644 --- a/linux/ecosystem/atlassian/jira/8/8.9.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.9.0/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.9.0" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.9.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.9.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.9.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.9.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.9.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.9.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/8/8.9.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.9.1/Dockerfile index d3d23294c..97970ecca 100644 --- a/linux/ecosystem/atlassian/jira/8/8.9.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/8/8.9.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.9.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/8/8.9.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.9.1/Dockerfile.jdk11 index a1c1e41d7..c7222679f 100644 --- a/linux/ecosystem/atlassian/jira/8/8.9.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/8/8.9.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=8.9.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/8/8.9.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.9.1/docker-compose.yml index 21b322779..3a6df7b7e 100644 --- a/linux/ecosystem/atlassian/jira/8/8.9.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/8/8.9.1/docker-compose.yml @@ -1,9 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:8.9.1" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + app-jdk8: + image: "epicmorg/jira:8.9.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:8.9.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/8/8.9.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.9.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/8/8.9.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/8/8.9.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.0.0/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.0.0/Dockerfile index d3d23294c..f97b2072c 100644 --- a/linux/ecosystem/atlassian/jira/9/9.0.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.0.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.0.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.0.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.0.0/Dockerfile.jdk11 index a1c1e41d7..500ee189d 100644 --- a/linux/ecosystem/atlassian/jira/9/9.0.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.0.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.0.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.0.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.0.0/docker-compose.yml index b65684368..59fb078f9 100644 --- a/linux/ecosystem/atlassian/jira/9/9.0.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.0.0/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.0.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.0.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.0.0-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.0.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.0.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.0.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.0.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.1.0/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.1.0/Dockerfile index d3d23294c..112944a8b 100644 --- a/linux/ecosystem/atlassian/jira/9/9.1.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.1.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.1.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.1.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.1.0/Dockerfile.jdk11 index a1c1e41d7..da5cbd181 100644 --- a/linux/ecosystem/atlassian/jira/9/9.1.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.1.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.1.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.1.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.1.0/docker-compose.yml index b65684368..e6bfcf468 100644 --- a/linux/ecosystem/atlassian/jira/9/9.1.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.1.0/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.1.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.1.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.1.0-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.1.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.1.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.1.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.1.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.1.1/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.1.1/Dockerfile index d3d23294c..f3904430f 100644 --- a/linux/ecosystem/atlassian/jira/9/9.1.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.1.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.1.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.1.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.1.1/Dockerfile.jdk11 index a1c1e41d7..02732a1d2 100644 --- a/linux/ecosystem/atlassian/jira/9/9.1.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.1.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.1.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.1.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.1.1/docker-compose.yml index b65684368..8a244ecde 100644 --- a/linux/ecosystem/atlassian/jira/9/9.1.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.1.1/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.1.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.1.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.1.1-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.1.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.1.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.1.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.1.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.10.0/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.10.0/Dockerfile index d3d23294c..7e69b5f49 100644 --- a/linux/ecosystem/atlassian/jira/9/9.10.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.10.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.10.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.10.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.10.0/Dockerfile.jdk11 index a1c1e41d7..150b72e87 100644 --- a/linux/ecosystem/atlassian/jira/9/9.10.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.10.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.10.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.10.0/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.10.0/Dockerfile.jdk17 index fdd79def6..8d8da98dd 100644 --- a/linux/ecosystem/atlassian/jira/9/9.10.0/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.10.0/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.10.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.10.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.10.0/docker-compose.yml index 32c492ee6..0b670a646 100644 --- a/linux/ecosystem/atlassian/jira/9/9.10.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.10.0/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.10.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.10.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.10.0-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.10.0-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.10.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.10.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.10.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.10.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.10.1/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.10.1/Dockerfile index d3d23294c..3432b07b2 100644 --- a/linux/ecosystem/atlassian/jira/9/9.10.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.10.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.10.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.10.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.10.1/Dockerfile.jdk11 index a1c1e41d7..69be5fcdb 100644 --- a/linux/ecosystem/atlassian/jira/9/9.10.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.10.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.10.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.10.1/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.10.1/Dockerfile.jdk17 index fdd79def6..9526b4b47 100644 --- a/linux/ecosystem/atlassian/jira/9/9.10.1/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.10.1/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.10.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.10.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.10.1/docker-compose.yml index 32c492ee6..e86b97406 100644 --- a/linux/ecosystem/atlassian/jira/9/9.10.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.10.1/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.10.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.10.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.10.1-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.10.1-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.10.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.10.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.10.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.10.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.10.2/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.10.2/Dockerfile index d3d23294c..514dab8ec 100644 --- a/linux/ecosystem/atlassian/jira/9/9.10.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.10.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.10.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.10.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.10.2/Dockerfile.jdk11 index a1c1e41d7..fe0f146f9 100644 --- a/linux/ecosystem/atlassian/jira/9/9.10.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.10.2/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.10.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.10.2/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.10.2/Dockerfile.jdk17 index fdd79def6..d4f1c1b6a 100644 --- a/linux/ecosystem/atlassian/jira/9/9.10.2/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.10.2/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.10.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.10.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.10.2/docker-compose.yml index 32c492ee6..29fffb7b4 100644 --- a/linux/ecosystem/atlassian/jira/9/9.10.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.10.2/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.10.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.10.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.10.2-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.10.2-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.10.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.10.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.10.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.10.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.11.0/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.11.0/Dockerfile index d3d23294c..37c0f288f 100644 --- a/linux/ecosystem/atlassian/jira/9/9.11.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.11.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.11.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.11.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.11.0/Dockerfile.jdk11 index a1c1e41d7..77f92c3c4 100644 --- a/linux/ecosystem/atlassian/jira/9/9.11.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.11.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.11.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.11.0/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.11.0/Dockerfile.jdk17 index fdd79def6..3570d1f32 100644 --- a/linux/ecosystem/atlassian/jira/9/9.11.0/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.11.0/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.11.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.11.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.11.0/docker-compose.yml index 32c492ee6..1399dc512 100644 --- a/linux/ecosystem/atlassian/jira/9/9.11.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.11.0/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.11.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.11.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.11.0-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.11.0-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.11.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.11.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.11.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.11.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.11.1/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.11.1/Dockerfile index d3d23294c..853159085 100644 --- a/linux/ecosystem/atlassian/jira/9/9.11.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.11.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.11.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.11.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.11.1/Dockerfile.jdk11 index a1c1e41d7..c9ba5433a 100644 --- a/linux/ecosystem/atlassian/jira/9/9.11.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.11.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.11.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.11.1/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.11.1/Dockerfile.jdk17 index fdd79def6..764256320 100644 --- a/linux/ecosystem/atlassian/jira/9/9.11.1/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.11.1/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.11.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.11.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.11.1/docker-compose.yml index 32c492ee6..79109ec66 100644 --- a/linux/ecosystem/atlassian/jira/9/9.11.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.11.1/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.11.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.11.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.11.1-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.11.1-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.11.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.11.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.11.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.11.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.11.2/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.11.2/Dockerfile index d3d23294c..b27530745 100644 --- a/linux/ecosystem/atlassian/jira/9/9.11.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.11.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.11.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.11.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.11.2/Dockerfile.jdk11 index a1c1e41d7..ba8d8a0a3 100644 --- a/linux/ecosystem/atlassian/jira/9/9.11.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.11.2/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.11.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.11.2/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.11.2/Dockerfile.jdk17 index fdd79def6..8aa1be2d3 100644 --- a/linux/ecosystem/atlassian/jira/9/9.11.2/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.11.2/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.11.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.11.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.11.2/docker-compose.yml index 32c492ee6..0ea283652 100644 --- a/linux/ecosystem/atlassian/jira/9/9.11.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.11.2/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.11.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.11.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.11.2-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.11.2-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.11.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.11.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.11.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.11.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.11.3/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.11.3/Dockerfile index d3d23294c..6705d6123 100644 --- a/linux/ecosystem/atlassian/jira/9/9.11.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.11.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.11.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.11.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.11.3/Dockerfile.jdk11 index a1c1e41d7..1a7135441 100644 --- a/linux/ecosystem/atlassian/jira/9/9.11.3/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.11.3/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.11.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.11.3/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.11.3/Dockerfile.jdk17 index fdd79def6..3bdb5b86a 100644 --- a/linux/ecosystem/atlassian/jira/9/9.11.3/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.11.3/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.11.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.11.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.11.3/docker-compose.yml index 32c492ee6..d85c85c2e 100644 --- a/linux/ecosystem/atlassian/jira/9/9.11.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.11.3/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.11.3" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.11.3-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.11.3-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.11.3-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.11.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.11.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.11.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.11.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.12.0/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.12.0/Dockerfile index d3d23294c..7b17b2549 100644 --- a/linux/ecosystem/atlassian/jira/9/9.12.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.12.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.12.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.12.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.12.0/Dockerfile.jdk11 index a1c1e41d7..af610c5ec 100644 --- a/linux/ecosystem/atlassian/jira/9/9.12.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.12.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.12.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.12.0/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.12.0/Dockerfile.jdk17 index fdd79def6..5ca97e161 100644 --- a/linux/ecosystem/atlassian/jira/9/9.12.0/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.12.0/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.12.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.12.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.12.0/docker-compose.yml index 32c492ee6..b3009b633 100644 --- a/linux/ecosystem/atlassian/jira/9/9.12.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.12.0/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.12.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.12.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.12.0-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.12.0-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.12.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.12.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.12.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.12.1/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.12.1/Dockerfile index d3d23294c..823ca49e9 100644 --- a/linux/ecosystem/atlassian/jira/9/9.12.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.12.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.12.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.12.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.12.1/Dockerfile.jdk11 index a1c1e41d7..fd4d8bb06 100644 --- a/linux/ecosystem/atlassian/jira/9/9.12.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.12.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.12.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.12.1/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.12.1/Dockerfile.jdk17 index fdd79def6..ec37752a3 100644 --- a/linux/ecosystem/atlassian/jira/9/9.12.1/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.12.1/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.12.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.12.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.12.1/docker-compose.yml index 32c492ee6..3dccb11aa 100644 --- a/linux/ecosystem/atlassian/jira/9/9.12.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.12.1/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.12.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.12.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.12.1-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.12.1-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.12.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.12.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.12.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.12.10/.env b/linux/ecosystem/atlassian/jira/9/9.12.10/.env new file mode 100644 index 000000000..95f8d0055 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.10/.env @@ -0,0 +1,2 @@ +RELEASE=9.12.10 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.10/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.12.10/Dockerfile new file mode 100644 index 000000000..217bfb8bf --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.10/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.12.10/Dockerfile.jdk11 similarity index 56% rename from bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk11 rename to linux/ecosystem/atlassian/jira/9/9.12.10/Dockerfile.jdk11 index a1c1e41d7..9b15f6740 100644 --- a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.12.10/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.12.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.12.10/Dockerfile.jdk17 similarity index 56% rename from bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk17 rename to linux/ecosystem/atlassian/jira/9/9.12.10/Dockerfile.jdk17 index fdd79def6..85763c6be 100644 --- a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.12.10/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.12.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.12.10/Makefile b/linux/ecosystem/atlassian/jira/9/9.12.10/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.10/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.12.10/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.12.10/docker-compose.yml new file mode 100644 index 000000000..ec0e0db5c --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.10/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.12.10" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.12.10-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.12.10-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.12.10-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.10/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.12.10/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.10/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.12.11/.env b/linux/ecosystem/atlassian/jira/9/9.12.11/.env new file mode 100644 index 000000000..fe84336ca --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.11/.env @@ -0,0 +1,2 @@ +RELEASE=9.12.11 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.11/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.12.11/Dockerfile new file mode 100644 index 000000000..f9ac69251 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.11/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.11/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.12.11/Dockerfile.jdk11 new file mode 100644 index 000000000..b0b75ccd6 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.11/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.11/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.12.11/Dockerfile.jdk17 new file mode 100644 index 000000000..950406a9f --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.11/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.11/Makefile b/linux/ecosystem/atlassian/jira/9/9.12.11/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.11/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.12.11/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.12.11/docker-compose.yml new file mode 100644 index 000000000..c69a1c1d7 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.11/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.12.11" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.12.11-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.12.11-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.12.11-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.11/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.12.11/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.11/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.12.12/.env b/linux/ecosystem/atlassian/jira/9/9.12.12/.env new file mode 100644 index 000000000..5e78b81f4 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.12/.env @@ -0,0 +1,2 @@ +RELEASE=9.12.12 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.12/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.12.12/Dockerfile index cfbeaa2b8..6a0f8d156 100644 --- a/linux/ecosystem/atlassian/jira/9/9.12.12/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.12.12/Dockerfile @@ -28,22 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && wget --random-wait --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36" -P /tmp/ ${DOWNLOAD_URL} \ - && tar -xzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.12.12/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.12.12/Dockerfile.jdk11 index a0d16cdb7..45354ccda 100644 --- a/linux/ecosystem/atlassian/jira/9/9.12.12/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.12.12/Dockerfile.jdk11 @@ -28,17 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && wget --random-wait --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36" -P /tmp/ ${DOWNLOAD_URL} \ - && tar -xzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.12.12/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.12.12/Dockerfile.jdk17 index a5d7e379c..ffff07e7e 100644 --- a/linux/ecosystem/atlassian/jira/9/9.12.12/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.12.12/Dockerfile.jdk17 @@ -28,17 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && wget --random-wait --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36" -P /tmp/ ${DOWNLOAD_URL} \ - && tar -xzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.12.12/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.12.12/docker-compose.yml index 90b0a227d..db00611f6 100644 --- a/linux/ecosystem/atlassian/jira/9/9.12.12/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.12.12/docker-compose.yml @@ -1,9 +1,13 @@ -#version: '3' +#version: '3.9' services: app: image: "epicmorg/jira:9.12.12" build: context: . + app-jdk8: + image: "epicmorg/jira:9.12.12-jdk8" + build: + context: . app-jdk11: image: "epicmorg/jira:9.12.12-jdk11" build: @@ -13,4 +17,4 @@ services: image: "epicmorg/jira:9.12.12-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.12/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.12.12/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.12.12/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.12.12/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.12.13/.env b/linux/ecosystem/atlassian/jira/9/9.12.13/.env new file mode 100644 index 000000000..cb1465bc5 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.13/.env @@ -0,0 +1,2 @@ +RELEASE=9.12.13 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.13/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.12.13/Dockerfile new file mode 100644 index 000000000..8e8c7020e --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.13/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.13 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.13/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.12.13/Dockerfile.jdk11 new file mode 100644 index 000000000..c39a00054 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.13/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.13 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.13/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.12.13/Dockerfile.jdk17 new file mode 100644 index 000000000..f6adabeef --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.13/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.13 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.13/Makefile b/linux/ecosystem/atlassian/jira/9/9.12.13/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.13/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.12.13/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.12.13/docker-compose.yml new file mode 100644 index 000000000..b303a336e --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.13/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.12.13" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.12.13-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.12.13-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.12.13-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.13/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.12.13/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.13/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.12.14/.env b/linux/ecosystem/atlassian/jira/9/9.12.14/.env new file mode 100644 index 000000000..222704c69 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.14/.env @@ -0,0 +1,2 @@ +RELEASE=9.12.14 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.14/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.12.14/Dockerfile new file mode 100644 index 000000000..0a3f90944 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.14/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.14/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.12.14/Dockerfile.jdk11 new file mode 100644 index 000000000..bc1a2d7ba --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.14/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.14/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.12.14/Dockerfile.jdk17 new file mode 100644 index 000000000..0025df2f1 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.14/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.14/Makefile b/linux/ecosystem/atlassian/jira/9/9.12.14/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.14/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.12.14/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.12.14/docker-compose.yml new file mode 100644 index 000000000..ae9a054f5 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.14/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.12.14" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.12.14-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.12.14-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.12.14-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.14/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.12.14/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.14/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.12.15/.env b/linux/ecosystem/atlassian/jira/9/9.12.15/.env new file mode 100644 index 000000000..fd1aec7fa --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.15/.env @@ -0,0 +1,2 @@ +RELEASE=9.12.15 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.15/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.12.15/Dockerfile new file mode 100644 index 000000000..dc8b8c587 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.15/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.15 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.15/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.12.15/Dockerfile.jdk11 new file mode 100644 index 000000000..e3b694919 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.15/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.15 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.15/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.12.15/Dockerfile.jdk17 new file mode 100644 index 000000000..9561f4683 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.15/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.15 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.15/Makefile b/linux/ecosystem/atlassian/jira/9/9.12.15/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.15/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.12.15/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.12.15/docker-compose.yml new file mode 100644 index 000000000..4d57cff1c --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.15/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.12.15" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.12.15-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.12.15-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.12.15-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.15/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.12.15/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.15/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.12.2/.env b/linux/ecosystem/atlassian/jira/9/9.12.2/.env new file mode 100644 index 000000000..ba7f96020 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.2/.env @@ -0,0 +1,2 @@ +RELEASE=9.12.2 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.2/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.12.2/Dockerfile index fc5e8155b..d92145f73 100644 --- a/linux/ecosystem/atlassian/jira/9/9.12.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.12.2/Dockerfile @@ -28,22 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && wget --random-wait --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36" -P /tmp/ ${DOWNLOAD_URL} \ - && tar -xzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.12.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.12.2/Dockerfile.jdk11 index a8a1a7c4b..486678be8 100644 --- a/linux/ecosystem/atlassian/jira/9/9.12.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.12.2/Dockerfile.jdk11 @@ -28,17 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && wget --random-wait --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36" -P /tmp/ ${DOWNLOAD_URL} \ - && tar -xzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.12.2/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.12.2/Dockerfile.jdk17 index 1e624719b..912c66a87 100644 --- a/linux/ecosystem/atlassian/jira/9/9.12.2/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.12.2/Dockerfile.jdk17 @@ -28,17 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && wget --random-wait --retry-connrefused --waitretry=5 --read-timeout=20 --timeout=15 --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36" -P /tmp/ ${DOWNLOAD_URL} \ - && tar -xzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.12.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.12.2/docker-compose.yml index bbd71d7b7..813260b36 100644 --- a/linux/ecosystem/atlassian/jira/9/9.12.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.12.2/docker-compose.yml @@ -1,9 +1,13 @@ -#version: '3' +#version: '3.9' services: app: image: "epicmorg/jira:9.12.2" build: context: . + app-jdk8: + image: "epicmorg/jira:9.12.2-jdk8" + build: + context: . app-jdk11: image: "epicmorg/jira:9.12.2-jdk11" build: @@ -13,4 +17,4 @@ services: image: "epicmorg/jira:9.12.2-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.12.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.12.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.12.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.12.3/.env b/linux/ecosystem/atlassian/jira/9/9.12.3/.env new file mode 100644 index 000000000..e42259dfd --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.3/.env @@ -0,0 +1,2 @@ +RELEASE=9.12.3 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.3/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.12.3/Dockerfile new file mode 100644 index 000000000..e434f9bb2 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.3/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.12.3/Dockerfile.jdk11 new file mode 100644 index 000000000..dc02a770b --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.3/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.3/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.12.3/Dockerfile.jdk17 new file mode 100644 index 000000000..17e7e540c --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.3/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.3/Makefile b/linux/ecosystem/atlassian/jira/9/9.12.3/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.3/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.12.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.12.3/docker-compose.yml new file mode 100644 index 000000000..f58deb711 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.3/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.12.3" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.12.3-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.12.3-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.12.3-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.12.3/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.3/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.12.4/.env b/linux/ecosystem/atlassian/jira/9/9.12.4/.env new file mode 100644 index 000000000..973da1fd8 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.4/.env @@ -0,0 +1,2 @@ +RELEASE=9.12.4 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.4/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.12.4/Dockerfile new file mode 100644 index 000000000..1f23767c4 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.4/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.12.4/Dockerfile.jdk11 new file mode 100644 index 000000000..be1964ac9 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.4/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.4/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.12.4/Dockerfile.jdk17 new file mode 100644 index 000000000..c5c24f90a --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.4/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.4/Makefile b/linux/ecosystem/atlassian/jira/9/9.12.4/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.4/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.12.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.12.4/docker-compose.yml new file mode 100644 index 000000000..ce9c2a621 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.4/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.12.4" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.12.4-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.12.4-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.12.4-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.12.4/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.4/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.12.5/.env b/linux/ecosystem/atlassian/jira/9/9.12.5/.env new file mode 100644 index 000000000..44cb77847 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.5/.env @@ -0,0 +1,2 @@ +RELEASE=9.12.5 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.5/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.12.5/Dockerfile new file mode 100644 index 000000000..47ee87ba0 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.5/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.5/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.12.5/Dockerfile.jdk11 new file mode 100644 index 000000000..7536803b2 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.5/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.5/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.12.5/Dockerfile.jdk17 new file mode 100644 index 000000000..9f74b59db --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.5/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.5/Makefile b/linux/ecosystem/atlassian/jira/9/9.12.5/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.5/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.12.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.12.5/docker-compose.yml new file mode 100644 index 000000000..b343e7509 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.5/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.12.5" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.12.5-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.12.5-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.12.5-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.12.5/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.5/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.12.6/.env b/linux/ecosystem/atlassian/jira/9/9.12.6/.env new file mode 100644 index 000000000..a485dec7b --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.6/.env @@ -0,0 +1,2 @@ +RELEASE=9.12.6 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.6/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.12.6/Dockerfile new file mode 100644 index 000000000..78e3575f3 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.6/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.6/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.12.6/Dockerfile.jdk11 new file mode 100644 index 000000000..246d6fa8b --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.6/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.6/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.12.6/Dockerfile.jdk17 new file mode 100644 index 000000000..d25cc1e79 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.6/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.6/Makefile b/linux/ecosystem/atlassian/jira/9/9.12.6/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.6/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.12.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.12.6/docker-compose.yml new file mode 100644 index 000000000..cb86e8779 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.6/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.12.6" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.12.6-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.12.6-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.12.6-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.12.6/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.6/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.12.7/.env b/linux/ecosystem/atlassian/jira/9/9.12.7/.env new file mode 100644 index 000000000..3ceecdaac --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.7/.env @@ -0,0 +1,2 @@ +RELEASE=9.12.7 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.7/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.12.7/Dockerfile new file mode 100644 index 000000000..e207fc6eb --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.7/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.7/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.12.7/Dockerfile.jdk11 new file mode 100644 index 000000000..e059558b8 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.7/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.7/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.12.7/Dockerfile.jdk17 new file mode 100644 index 000000000..e0db99516 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.7/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.7/Makefile b/linux/ecosystem/atlassian/jira/9/9.12.7/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.7/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.12.7/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.12.7/docker-compose.yml new file mode 100644 index 000000000..955cc13d7 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.7/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.12.7" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.12.7-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.12.7-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.12.7-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.7/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.12.7/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.7/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.12.8/.env b/linux/ecosystem/atlassian/jira/9/9.12.8/.env new file mode 100644 index 000000000..7c4609513 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.8/.env @@ -0,0 +1,2 @@ +RELEASE=9.12.8 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.8/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.12.8/Dockerfile new file mode 100644 index 000000000..afad02b74 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.8/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.8/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.12.8/Dockerfile.jdk11 new file mode 100644 index 000000000..e8989d336 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.8/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.8/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.12.8/Dockerfile.jdk17 new file mode 100644 index 000000000..a63580cf0 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.8/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.8/Makefile b/linux/ecosystem/atlassian/jira/9/9.12.8/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.8/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.12.8/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.12.8/docker-compose.yml new file mode 100644 index 000000000..e129b5d54 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.8/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.12.8" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.12.8-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.12.8-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.12.8-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.8/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.12.8/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.8/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.12.9/.env b/linux/ecosystem/atlassian/jira/9/9.12.9/.env new file mode 100644 index 000000000..12bcb2f98 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.9/.env @@ -0,0 +1,2 @@ +RELEASE=9.12.9 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.9/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.12.9/Dockerfile new file mode 100644 index 000000000..a4b0052e8 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.9/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.9/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.12.9/Dockerfile.jdk11 new file mode 100644 index 000000000..c4b171e80 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.9/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.9/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.12.9/Dockerfile.jdk17 new file mode 100644 index 000000000..b896f87ff --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.9/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.12.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.12.9/Makefile b/linux/ecosystem/atlassian/jira/9/9.12.9/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.9/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.12.9/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.12.9/docker-compose.yml new file mode 100644 index 000000000..f28534e72 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.9/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.12.9" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.12.9-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.12.9-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.12.9-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.12.9/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.12.9/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.12.9/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.13.0/.env b/linux/ecosystem/atlassian/jira/9/9.13.0/.env new file mode 100644 index 000000000..a4187b518 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.13.0/.env @@ -0,0 +1,2 @@ +RELEASE=9.13.0 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.13.0/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.13.0/Dockerfile new file mode 100644 index 000000000..dad6cecc0 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.13.0/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.13.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.13.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.13.0/Dockerfile.jdk11 new file mode 100644 index 000000000..b74b1d3ae --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.13.0/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.13.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.13.0/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.13.0/Dockerfile.jdk17 new file mode 100644 index 000000000..f6d17cb5c --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.13.0/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.13.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.13.0/Makefile b/linux/ecosystem/atlassian/jira/9/9.13.0/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.13.0/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.13.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.13.0/docker-compose.yml new file mode 100644 index 000000000..cd1f58bab --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.13.0/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.13.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.13.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.13.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.13.0-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.13.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.13.0/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.13.0/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.13.1/.env b/linux/ecosystem/atlassian/jira/9/9.13.1/.env new file mode 100644 index 000000000..159c9f284 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.13.1/.env @@ -0,0 +1,2 @@ +RELEASE=9.13.1 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.13.1/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.13.1/Dockerfile new file mode 100644 index 000000000..f13ad7eeb --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.13.1/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.13.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.13.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.13.1/Dockerfile.jdk11 new file mode 100644 index 000000000..0f9224bef --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.13.1/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.13.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.13.1/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.13.1/Dockerfile.jdk17 new file mode 100644 index 000000000..60f9e17d7 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.13.1/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.13.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.13.1/Makefile b/linux/ecosystem/atlassian/jira/9/9.13.1/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.13.1/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.13.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.13.1/docker-compose.yml new file mode 100644 index 000000000..ec3815ee7 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.13.1/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.13.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.13.1-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.13.1-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.13.1-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.13.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.13.1/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.13.1/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.14.0/.env b/linux/ecosystem/atlassian/jira/9/9.14.0/.env new file mode 100644 index 000000000..301bc8bd6 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.14.0/.env @@ -0,0 +1,2 @@ +RELEASE=9.14.0 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.14.0/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.14.0/Dockerfile new file mode 100644 index 000000000..f33efda1a --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.14.0/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.14.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.14.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.14.0/Dockerfile.jdk11 new file mode 100644 index 000000000..5942f6a0c --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.14.0/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.14.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.14.0/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.14.0/Dockerfile.jdk17 new file mode 100644 index 000000000..dbd3cf2b7 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.14.0/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.14.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.14.0/Makefile b/linux/ecosystem/atlassian/jira/9/9.14.0/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.14.0/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.14.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.14.0/docker-compose.yml new file mode 100644 index 000000000..d58df91a6 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.14.0/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.14.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.14.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.14.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.14.0-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.14.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.14.0/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.14.0/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.14.1/.env b/linux/ecosystem/atlassian/jira/9/9.14.1/.env new file mode 100644 index 000000000..9ca6ba8bf --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.14.1/.env @@ -0,0 +1,2 @@ +RELEASE=9.14.1 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.14.1/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.14.1/Dockerfile index 3da7edb02..362cb41cd 100644 --- a/linux/ecosystem/atlassian/jira/9/9.14.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.14.1/Dockerfile @@ -28,22 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && wget --random-wait --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36" -P /tmp/ ${DOWNLOAD_URL} \ - && tar -xzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.14.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.14.1/Dockerfile.jdk11 index 6775c8017..adcb89976 100644 --- a/linux/ecosystem/atlassian/jira/9/9.14.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.14.1/Dockerfile.jdk11 @@ -28,17 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && wget --random-wait --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36" -P /tmp/ ${DOWNLOAD_URL} \ - && tar -xzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.14.1/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.14.1/Dockerfile.jdk17 index f4a52bbca..7cc6505e9 100644 --- a/linux/ecosystem/atlassian/jira/9/9.14.1/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.14.1/Dockerfile.jdk17 @@ -28,17 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && wget --random-wait --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36" -P /tmp/ ${DOWNLOAD_URL} \ - && tar -xzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.14.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.14.1/docker-compose.yml index caa448ba8..34ea52318 100644 --- a/linux/ecosystem/atlassian/jira/9/9.14.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.14.1/docker-compose.yml @@ -1,9 +1,13 @@ -#version: '3' +#version: '3.9' services: app: image: "epicmorg/jira:9.14.1" build: context: . + app-jdk8: + image: "epicmorg/jira:9.14.1-jdk8" + build: + context: . app-jdk11: image: "epicmorg/jira:9.14.1-jdk11" build: @@ -13,4 +17,4 @@ services: image: "epicmorg/jira:9.14.1-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.14.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.14.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.14.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.14.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.15.2/.env b/linux/ecosystem/atlassian/jira/9/9.15.2/.env new file mode 100644 index 000000000..005ade3c7 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.15.2/.env @@ -0,0 +1,2 @@ +RELEASE=9.15.2 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.15.2/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.15.2/Dockerfile new file mode 100644 index 000000000..6d0b36636 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.15.2/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.15.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.15.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.15.2/Dockerfile.jdk11 new file mode 100644 index 000000000..502680866 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.15.2/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.15.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.15.2/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.15.2/Dockerfile.jdk17 new file mode 100644 index 000000000..683c1753f --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.15.2/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.15.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.15.2/Makefile b/linux/ecosystem/atlassian/jira/9/9.15.2/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.15.2/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.15.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.15.2/docker-compose.yml new file mode 100644 index 000000000..0f7603c8d --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.15.2/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.15.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.15.2-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.15.2-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.15.2-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.15.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.15.2/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.15.2/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.16.0/.env b/linux/ecosystem/atlassian/jira/9/9.16.0/.env new file mode 100644 index 000000000..8f6552416 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.16.0/.env @@ -0,0 +1,2 @@ +RELEASE=9.16.0 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.16.0/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.16.0/Dockerfile new file mode 100644 index 000000000..eef5ff0f2 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.16.0/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.16.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.16.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.16.0/Dockerfile.jdk11 new file mode 100644 index 000000000..33dc3302f --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.16.0/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.16.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.16.0/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.16.0/Dockerfile.jdk17 new file mode 100644 index 000000000..9f8b47fd7 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.16.0/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.16.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.16.0/Makefile b/linux/ecosystem/atlassian/jira/9/9.16.0/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.16.0/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.16.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.16.0/docker-compose.yml new file mode 100644 index 000000000..d217c8fc4 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.16.0/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.16.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.16.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.16.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.16.0-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.16.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.16.0/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.16.0/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.16.1/.env b/linux/ecosystem/atlassian/jira/9/9.16.1/.env new file mode 100644 index 000000000..4b6265c97 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.16.1/.env @@ -0,0 +1,2 @@ +RELEASE=9.16.1 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.16.1/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.16.1/Dockerfile index 815204e4d..bd17f041e 100644 --- a/linux/ecosystem/atlassian/jira/9/9.16.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.16.1/Dockerfile @@ -28,22 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && wget --random-wait --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36" -P /tmp/ ${DOWNLOAD_URL} \ - && tar -xzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.16.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.16.1/Dockerfile.jdk11 index 4c75a446d..2483f8072 100644 --- a/linux/ecosystem/atlassian/jira/9/9.16.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.16.1/Dockerfile.jdk11 @@ -28,17 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && wget --random-wait --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36" -P /tmp/ ${DOWNLOAD_URL} \ - && tar -xzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.16.1/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.16.1/Dockerfile.jdk17 index 137514a28..75336b932 100644 --- a/linux/ecosystem/atlassian/jira/9/9.16.1/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.16.1/Dockerfile.jdk17 @@ -28,17 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && wget --random-wait --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36" -P /tmp/ ${DOWNLOAD_URL} \ - && tar -xzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.16.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.16.1/docker-compose.yml index 312dfee53..0823f7c05 100644 --- a/linux/ecosystem/atlassian/jira/9/9.16.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.16.1/docker-compose.yml @@ -1,9 +1,13 @@ -#version: '3' +#version: '3.9' services: app: image: "epicmorg/jira:9.16.1" build: context: . + app-jdk8: + image: "epicmorg/jira:9.16.1-jdk8" + build: + context: . app-jdk11: image: "epicmorg/jira:9.16.1-jdk11" build: @@ -13,4 +17,4 @@ services: image: "epicmorg/jira:9.16.1-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.16.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.16.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.16.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.16.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.17.0/.env b/linux/ecosystem/atlassian/jira/9/9.17.0/.env new file mode 100644 index 000000000..767776d70 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.0/.env @@ -0,0 +1,2 @@ +RELEASE=9.17.0 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.17.0/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.17.0/Dockerfile new file mode 100644 index 000000000..e9f8cdcd5 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.0/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.17.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.17.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.17.0/Dockerfile.jdk11 new file mode 100644 index 000000000..3e622e67e --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.0/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.17.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.17.0/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.17.0/Dockerfile.jdk17 new file mode 100644 index 000000000..682b53c1a --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.0/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.17.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.17.0/Makefile b/linux/ecosystem/atlassian/jira/9/9.17.0/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.0/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.17.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.17.0/docker-compose.yml new file mode 100644 index 000000000..415fdbe0e --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.0/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.17.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.17.0-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.17.0-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.17.0-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.17.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.17.0/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.0/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.17.1/.env b/linux/ecosystem/atlassian/jira/9/9.17.1/.env new file mode 100644 index 000000000..5cbd19dff --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.1/.env @@ -0,0 +1,2 @@ +RELEASE=9.17.1 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.17.1/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.17.1/Dockerfile index f24640223..497cbab0e 100644 --- a/linux/ecosystem/atlassian/jira/9/9.17.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.17.1/Dockerfile @@ -28,22 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && wget --random-wait --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36" -P /tmp/ ${DOWNLOAD_URL} \ - && tar -xzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.17.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.17.1/Dockerfile.jdk11 index 55d146cf5..b4c3c36b1 100644 --- a/linux/ecosystem/atlassian/jira/9/9.17.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.17.1/Dockerfile.jdk11 @@ -28,17 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && wget --random-wait --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36" -P /tmp/ ${DOWNLOAD_URL} \ - && tar -xzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.17.1/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.17.1/Dockerfile.jdk17 index 6fbd4c71d..6c7a0437b 100644 --- a/linux/ecosystem/atlassian/jira/9/9.17.1/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.17.1/Dockerfile.jdk17 @@ -28,17 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && wget --random-wait --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36" -P /tmp/ ${DOWNLOAD_URL} \ - && tar -xzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.17.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.17.1/docker-compose.yml index eb3277724..550cf9ff4 100644 --- a/linux/ecosystem/atlassian/jira/9/9.17.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.17.1/docker-compose.yml @@ -1,9 +1,13 @@ -#version: '3' +#version: '3.9' services: app: image: "epicmorg/jira:9.17.1" build: context: . + app-jdk8: + image: "epicmorg/jira:9.17.1-jdk8" + build: + context: . app-jdk11: image: "epicmorg/jira:9.17.1-jdk11" build: @@ -13,5 +17,4 @@ services: image: "epicmorg/jira:9.17.1-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.17.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.17.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.17.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.17.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.17.2/.env b/linux/ecosystem/atlassian/jira/9/9.17.2/.env new file mode 100644 index 000000000..88a574547 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.2/.env @@ -0,0 +1,2 @@ +RELEASE=9.17.2 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.17.2/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.17.2/Dockerfile new file mode 100644 index 000000000..acce2bb6f --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.2/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.17.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.17.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.17.2/Dockerfile.jdk11 new file mode 100644 index 000000000..a31473b9e --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.2/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.17.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.17.2/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.17.2/Dockerfile.jdk17 new file mode 100644 index 000000000..fe97b2836 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.2/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.17.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.17.2/Makefile b/linux/ecosystem/atlassian/jira/9/9.17.2/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.2/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.17.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.17.2/docker-compose.yml new file mode 100644 index 000000000..bd775c980 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.2/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.17.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.17.2-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.17.2-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.17.2-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.17.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.17.2/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.2/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.17.3/.env b/linux/ecosystem/atlassian/jira/9/9.17.3/.env new file mode 100644 index 000000000..a26e96bfe --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.3/.env @@ -0,0 +1,2 @@ +RELEASE=9.17.3 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.17.3/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.17.3/Dockerfile new file mode 100644 index 000000000..bddeab4f2 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.3/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.17.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.17.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.17.3/Dockerfile.jdk11 new file mode 100644 index 000000000..271acd876 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.3/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.17.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.17.3/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.17.3/Dockerfile.jdk17 new file mode 100644 index 000000000..6a517ff86 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.3/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.17.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.17.3/Makefile b/linux/ecosystem/atlassian/jira/9/9.17.3/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.3/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.17.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.17.3/docker-compose.yml new file mode 100644 index 000000000..6726a3c36 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.3/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.17.3" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.17.3-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.17.3-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.17.3-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.17.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.17.3/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.3/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.17.4/.env b/linux/ecosystem/atlassian/jira/9/9.17.4/.env new file mode 100644 index 000000000..50228aaad --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.4/.env @@ -0,0 +1,2 @@ +RELEASE=9.17.4 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.17.4/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.17.4/Dockerfile new file mode 100644 index 000000000..bf73cbfb9 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.4/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.17.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.17.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.17.4/Dockerfile.jdk11 new file mode 100644 index 000000000..9d64976e6 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.4/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.17.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.17.4/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.17.4/Dockerfile.jdk17 new file mode 100644 index 000000000..8ca80c478 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.4/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.17.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.17.4/Makefile b/linux/ecosystem/atlassian/jira/9/9.17.4/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.4/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.17.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.17.4/docker-compose.yml new file mode 100644 index 000000000..43706cfd8 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.4/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.17.4" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.17.4-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.17.4-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.17.4-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.17.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.17.4/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.4/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.17.5/.env b/linux/ecosystem/atlassian/jira/9/9.17.5/.env new file mode 100644 index 000000000..f95d520f8 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.5/.env @@ -0,0 +1,2 @@ +RELEASE=9.17.5 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.17.5/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.17.5/Dockerfile new file mode 100644 index 000000000..86ff9f825 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.5/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.17.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.17.5/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.17.5/Dockerfile.jdk11 new file mode 100644 index 000000000..94a127c87 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.5/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.17.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.17.5/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.17.5/Dockerfile.jdk17 new file mode 100644 index 000000000..19518b835 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.5/Dockerfile.jdk17 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk17 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.17.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.17.5/Makefile b/linux/ecosystem/atlassian/jira/9/9.17.5/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.5/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.17.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.17.5/docker-compose.yml new file mode 100644 index 000000000..b0b75e5bf --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.5/docker-compose.yml @@ -0,0 +1,20 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.17.5" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.17.5-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.17.5-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 + app-jdk17: + image: "epicmorg/jira:9.17.5-jdk17" + build: + context: . + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.17.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.17.5/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.17.5/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.2.0/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.2.0/Dockerfile index d3d23294c..4438d4eaf 100644 --- a/linux/ecosystem/atlassian/jira/9/9.2.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.2.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.2.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.2.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.2.0/Dockerfile.jdk11 index a1c1e41d7..df558c34c 100644 --- a/linux/ecosystem/atlassian/jira/9/9.2.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.2.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.2.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.2.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.2.0/docker-compose.yml index b65684368..ebcbb39e6 100644 --- a/linux/ecosystem/atlassian/jira/9/9.2.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.2.0/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.2.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.2.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.2.0-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.2.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.2.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.2.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.2.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.2.1/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.2.1/Dockerfile index d3d23294c..b6e082640 100644 --- a/linux/ecosystem/atlassian/jira/9/9.2.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.2.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.2.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.2.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.2.1/Dockerfile.jdk11 index a1c1e41d7..cf27e115f 100644 --- a/linux/ecosystem/atlassian/jira/9/9.2.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.2.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.2.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.2.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.2.1/docker-compose.yml index b65684368..ac0fbe8d7 100644 --- a/linux/ecosystem/atlassian/jira/9/9.2.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.2.1/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.2.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.2.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.2.1-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.2.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.2.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.2.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.2.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.3.0/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.3.0/Dockerfile index d3d23294c..6f87f6afd 100644 --- a/linux/ecosystem/atlassian/jira/9/9.3.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.3.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.3.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.3.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.3.0/Dockerfile.jdk11 index a1c1e41d7..bd3d7a80c 100644 --- a/linux/ecosystem/atlassian/jira/9/9.3.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.3.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.3.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.3.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.3.0/docker-compose.yml index b65684368..6f4bd37f5 100644 --- a/linux/ecosystem/atlassian/jira/9/9.3.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.3.0/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.3.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.3.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.3.0-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.3.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.3.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.3.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.3.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.3.1/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.3.1/Dockerfile index d3d23294c..db76fea5b 100644 --- a/linux/ecosystem/atlassian/jira/9/9.3.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.3.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.3.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.3.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.3.1/Dockerfile.jdk11 index a1c1e41d7..edd1a9aeb 100644 --- a/linux/ecosystem/atlassian/jira/9/9.3.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.3.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.3.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.3.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.3.1/docker-compose.yml index b65684368..da35cb8c9 100644 --- a/linux/ecosystem/atlassian/jira/9/9.3.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.3.1/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.3.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.3.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.3.1-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.3.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.3.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.3.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.3.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.3.2/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.3.2/Dockerfile index d3d23294c..449cab3c8 100644 --- a/linux/ecosystem/atlassian/jira/9/9.3.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.3.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.3.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.3.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.3.2/Dockerfile.jdk11 index a1c1e41d7..25970e638 100644 --- a/linux/ecosystem/atlassian/jira/9/9.3.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.3.2/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.3.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.3.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.3.2/docker-compose.yml index b65684368..190bb9eee 100644 --- a/linux/ecosystem/atlassian/jira/9/9.3.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.3.2/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.3.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.3.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.3.2-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.3.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.3.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.3.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.3.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.3.3/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.3.3/Dockerfile index d3d23294c..0ab147b06 100644 --- a/linux/ecosystem/atlassian/jira/9/9.3.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.3.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.3.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.3.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.3.3/Dockerfile.jdk11 index a1c1e41d7..393024aae 100644 --- a/linux/ecosystem/atlassian/jira/9/9.3.3/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.3.3/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.3.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.3.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.3.3/docker-compose.yml index b65684368..754eae965 100644 --- a/linux/ecosystem/atlassian/jira/9/9.3.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.3.3/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.3.3" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.3.3-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.3.3-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.3.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.3.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.3.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.3.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.0/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.0/Dockerfile index d3d23294c..2c0c36b50 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.4.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.4.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.0/Dockerfile.jdk11 index a1c1e41d7..476d87b3f 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.4.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.4.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.0/docker-compose.yml index b65684368..fc6912970 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.4.0/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.4.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.4.0-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.4.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.4.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.4.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.1/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.1/Dockerfile index d3d23294c..07519c5ab 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.4.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.4.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.1/Dockerfile.jdk11 index a1c1e41d7..98d5da4b5 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.4.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.4.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.1/docker-compose.yml index b65684368..8dfbe36a6 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.4.1/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.4.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.4.1-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.4.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.4.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.4.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.10/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.10/Dockerfile index d3d23294c..33612c039 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.10/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.4.10/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.4.10/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.10/Dockerfile.jdk11 index a1c1e41d7..2301e19e5 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.10/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.4.10/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.10 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.4.10/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.10/docker-compose.yml index b65684368..e9e524423 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.10/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.4.10/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.4.10" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.10-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.4.10-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.4.10/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.10/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.4.10/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.4.10/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.11/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.11/Dockerfile index d3d23294c..54ce23d19 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.11/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.4.11/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.4.11/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.11/Dockerfile.jdk11 index a1c1e41d7..669816f07 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.11/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.4.11/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.11 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.4.11/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.11/docker-compose.yml index b65684368..5d404372c 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.11/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.4.11/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.4.11" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.11-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.4.11-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.4.11/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.11/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.4.11/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.4.11/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.12/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.12/Dockerfile index d3d23294c..714bb4c3c 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.12/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.4.12/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.12 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.4.12/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.12/Dockerfile.jdk11 index a1c1e41d7..90c927625 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.12/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.4.12/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.12 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.4.12/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.12/docker-compose.yml index b65684368..938c7758d 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.12/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.4.12/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.4.12" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.12-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.4.12-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.4.12/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.12/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.4.12/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.4.12/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.14/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.14/Dockerfile index d3d23294c..45cebdaff 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.14/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.4.14/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.4.14/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.14/Dockerfile.jdk11 index a1c1e41d7..83fd3eb49 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.14/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.4.14/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.14 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.4.14/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.14/docker-compose.yml index b65684368..6e7860580 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.14/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.4.14/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.4.14" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.14-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.4.14-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.4.14/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.14/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.4.14/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.4.14/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.15/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.15/Dockerfile index d3d23294c..94fe390d1 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.15/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.4.15/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.15 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.4.15/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.15/Dockerfile.jdk11 index a1c1e41d7..ee9f2d43d 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.15/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.4.15/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.15 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.4.15/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.15/docker-compose.yml index b65684368..d81339e10 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.15/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.4.15/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.4.15" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.15-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.4.15-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.4.15/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.15/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.4.15/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.4.15/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.16/.env b/linux/ecosystem/atlassian/jira/9/9.4.16/.env new file mode 100644 index 000000000..becfa669f --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.16/.env @@ -0,0 +1,2 @@ +RELEASE=9.4.16 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.4.16/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.16/Dockerfile new file mode 100644 index 000000000..04597ff20 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.16/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.16 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.16/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.16/Dockerfile.jdk11 new file mode 100644 index 000000000..829243261 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.16/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.16 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.16/Makefile b/linux/ecosystem/atlassian/jira/9/9.4.16/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.16/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.4.16/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.16/docker-compose.yml new file mode 100644 index 000000000..1438d2931 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.16/docker-compose.yml @@ -0,0 +1,15 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.4.16" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.16-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.4.16-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/9/9.4.16/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.16/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.16/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.17/.env b/linux/ecosystem/atlassian/jira/9/9.4.17/.env new file mode 100644 index 000000000..ad1d9637a --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.17/.env @@ -0,0 +1,2 @@ +RELEASE=9.4.17 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.4.17/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.17/Dockerfile new file mode 100644 index 000000000..a70679ce2 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.17/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.17 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.17/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.17/Dockerfile.jdk11 new file mode 100644 index 000000000..91357b96a --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.17/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.17 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.17/Makefile b/linux/ecosystem/atlassian/jira/9/9.4.17/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.17/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.4.17/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.17/docker-compose.yml new file mode 100644 index 000000000..7fd414ed5 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.17/docker-compose.yml @@ -0,0 +1,15 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.4.17" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.17-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.4.17-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/9/9.4.17/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.17/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.17/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.18/.env b/linux/ecosystem/atlassian/jira/9/9.4.18/.env new file mode 100644 index 000000000..bec995861 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.18/.env @@ -0,0 +1,2 @@ +RELEASE=9.4.18 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.4.18/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.18/Dockerfile new file mode 100644 index 000000000..cff46e5c1 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.18/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.18 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.18/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.18/Dockerfile.jdk11 new file mode 100644 index 000000000..c3e7c5196 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.18/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.18 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.18/Makefile b/linux/ecosystem/atlassian/jira/9/9.4.18/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.18/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.4.18/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.18/docker-compose.yml new file mode 100644 index 000000000..abc8a87b2 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.18/docker-compose.yml @@ -0,0 +1,15 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.4.18" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.18-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.4.18-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/9/9.4.18/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.18/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.18/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.19/.env b/linux/ecosystem/atlassian/jira/9/9.4.19/.env new file mode 100644 index 000000000..8883aceae --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.19/.env @@ -0,0 +1,2 @@ +RELEASE=9.4.19 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.4.19/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.19/Dockerfile new file mode 100644 index 000000000..1562c5ec8 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.19/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.19 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.19/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.19/Dockerfile.jdk11 new file mode 100644 index 000000000..f86245602 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.19/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.19 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.19/Makefile b/linux/ecosystem/atlassian/jira/9/9.4.19/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.19/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.4.19/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.19/docker-compose.yml new file mode 100644 index 000000000..8ba1c5e88 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.19/docker-compose.yml @@ -0,0 +1,15 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.4.19" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.19-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.4.19-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/9/9.4.19/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.19/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.19/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.2/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.2/Dockerfile index d3d23294c..8233a7fbd 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.4.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.4.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.2/Dockerfile.jdk11 index a1c1e41d7..079654f72 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.4.2/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.4.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.2/docker-compose.yml index b65684368..8ef4df4f8 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.4.2/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.4.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.4.2-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.4.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.4.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.4.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.20/.env b/linux/ecosystem/atlassian/jira/9/9.4.20/.env new file mode 100644 index 000000000..7c9465d7c --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.20/.env @@ -0,0 +1,2 @@ +RELEASE=9.4.20 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.4.20/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.20/Dockerfile new file mode 100644 index 000000000..c64e84287 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.20/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.20 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.20/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.20/Dockerfile.jdk11 new file mode 100644 index 000000000..e1db148bb --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.20/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.20 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.20/Makefile b/linux/ecosystem/atlassian/jira/9/9.4.20/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.20/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.4.20/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.20/docker-compose.yml new file mode 100644 index 000000000..2d3e1455d --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.20/docker-compose.yml @@ -0,0 +1,15 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.4.20" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.20-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.4.20-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/9/9.4.20/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.20/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.20/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.21/.env b/linux/ecosystem/atlassian/jira/9/9.4.21/.env new file mode 100644 index 000000000..b4115f3b1 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.21/.env @@ -0,0 +1,2 @@ +RELEASE=9.4.21 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.4.21/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.21/Dockerfile new file mode 100644 index 000000000..65c194e60 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.21/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.21 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.21/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.21/Dockerfile.jdk11 new file mode 100644 index 000000000..a6542e58f --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.21/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.21 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.21/Makefile b/linux/ecosystem/atlassian/jira/9/9.4.21/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.21/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.4.21/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.21/docker-compose.yml new file mode 100644 index 000000000..c6d5af1ea --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.21/docker-compose.yml @@ -0,0 +1,15 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.4.21" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.21-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.4.21-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/9/9.4.21/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.21/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.21/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.22/.env b/linux/ecosystem/atlassian/jira/9/9.4.22/.env new file mode 100644 index 000000000..9b1063725 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.22/.env @@ -0,0 +1,2 @@ +RELEASE=9.4.22 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.4.22/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.22/Dockerfile new file mode 100644 index 000000000..53df88431 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.22/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.22 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.22/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.22/Dockerfile.jdk11 new file mode 100644 index 000000000..a5c02663a --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.22/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.22 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.22/Makefile b/linux/ecosystem/atlassian/jira/9/9.4.22/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.22/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.4.22/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.22/docker-compose.yml new file mode 100644 index 000000000..40af6d609 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.22/docker-compose.yml @@ -0,0 +1,15 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.4.22" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.22-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.4.22-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/9/9.4.22/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.22/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.22/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.23/.env b/linux/ecosystem/atlassian/jira/9/9.4.23/.env new file mode 100644 index 000000000..bff6fd9a0 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.23/.env @@ -0,0 +1,2 @@ +RELEASE=9.4.23 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.4.23/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.23/Dockerfile new file mode 100644 index 000000000..5c5cec154 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.23/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.23 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.23/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.23/Dockerfile.jdk11 new file mode 100644 index 000000000..bc21a74c3 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.23/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.23 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.23/Makefile b/linux/ecosystem/atlassian/jira/9/9.4.23/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.23/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.4.23/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.23/docker-compose.yml new file mode 100644 index 000000000..67c3f0ede --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.23/docker-compose.yml @@ -0,0 +1,15 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.4.23" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.23-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.4.23-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/9/9.4.23/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.23/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.23/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.24/.env b/linux/ecosystem/atlassian/jira/9/9.4.24/.env new file mode 100644 index 000000000..2e8139c46 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.24/.env @@ -0,0 +1,2 @@ +RELEASE=9.4.24 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.4.24/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.24/Dockerfile new file mode 100644 index 000000000..19580626d --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.24/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.24 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.24/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.24/Dockerfile.jdk11 new file mode 100644 index 000000000..b5e823faf --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.24/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.24 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.24/Makefile b/linux/ecosystem/atlassian/jira/9/9.4.24/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.24/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.4.24/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.24/docker-compose.yml new file mode 100644 index 000000000..07a3cfa81 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.24/docker-compose.yml @@ -0,0 +1,15 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.4.24" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.24-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.4.24-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/9/9.4.24/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.24/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.24/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.25/.env b/linux/ecosystem/atlassian/jira/9/9.4.25/.env new file mode 100644 index 000000000..939d386dc --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.25/.env @@ -0,0 +1,2 @@ +RELEASE=9.4.25 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.4.25/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.25/Dockerfile new file mode 100644 index 000000000..eec9469e3 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.25/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.25 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.25/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.25/Dockerfile.jdk11 new file mode 100644 index 000000000..89e8f2884 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.25/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.25 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.25/Makefile b/linux/ecosystem/atlassian/jira/9/9.4.25/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.25/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.4.25/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.25/docker-compose.yml new file mode 100644 index 000000000..9c59f1674 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.25/docker-compose.yml @@ -0,0 +1,15 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.4.25" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.25-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.4.25-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/9/9.4.25/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.25/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.25/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.26/.env b/linux/ecosystem/atlassian/jira/9/9.4.26/.env new file mode 100644 index 000000000..92d58a88e --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.26/.env @@ -0,0 +1,2 @@ +RELEASE=9.4.26 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.4.26/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.26/Dockerfile new file mode 100644 index 000000000..c782c69a7 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.26/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.26 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.26/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.26/Dockerfile.jdk11 new file mode 100644 index 000000000..3b1d1d589 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.26/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.26 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.26/Makefile b/linux/ecosystem/atlassian/jira/9/9.4.26/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.26/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.4.26/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.26/docker-compose.yml new file mode 100644 index 000000000..3ec6f5f9b --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.26/docker-compose.yml @@ -0,0 +1,15 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.4.26" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.26-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.4.26-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/9/9.4.26/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.26/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.26/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.27/.env b/linux/ecosystem/atlassian/jira/9/9.4.27/.env new file mode 100644 index 000000000..f179803a2 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.27/.env @@ -0,0 +1,2 @@ +RELEASE=9.4.27 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.4.27/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.27/Dockerfile new file mode 100644 index 000000000..6dd90adfb --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.27/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.27 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.27/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.27/Dockerfile.jdk11 new file mode 100644 index 000000000..e2021cdf9 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.27/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.27 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.27/Makefile b/linux/ecosystem/atlassian/jira/9/9.4.27/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.27/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.4.27/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.27/docker-compose.yml new file mode 100644 index 000000000..28ca7d351 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.27/docker-compose.yml @@ -0,0 +1,15 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.4.27" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.27-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.4.27-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/9/9.4.27/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.27/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.27/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.28/.env b/linux/ecosystem/atlassian/jira/9/9.4.28/.env new file mode 100644 index 000000000..a1a417f78 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.28/.env @@ -0,0 +1,2 @@ +RELEASE=9.4.28 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.4.28/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.28/Dockerfile new file mode 100644 index 000000000..e77b91db4 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.28/Dockerfile @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.28 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.28/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.28/Dockerfile.jdk11 new file mode 100644 index 000000000..14f7ab982 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.28/Dockerfile.jdk11 @@ -0,0 +1,51 @@ +FROM epicmorg/debian:bookworm-jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +ARG RELEASE=9.4.28 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/* + +RUN updatedb + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/9/9.4.28/Makefile b/linux/ecosystem/atlassian/jira/9/9.4.28/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.28/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + kaniko-wrapper --version + +dry: + make dry-run + +test: + make dry-run + +dry-run: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/ecosystem/atlassian/jira/9/9.4.28/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.28/docker-compose.yml new file mode 100644 index 000000000..320badcf0 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.28/docker-compose.yml @@ -0,0 +1,15 @@ +#version: '3.9' +services: + app: + image: "epicmorg/jira:9.4.28" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.28-jdk8" + build: + context: . + app-jdk11: + image: "epicmorg/jira:9.4.28-jdk11" + build: + context: . + dockerfile: Dockerfile.jdk11 diff --git a/linux/ecosystem/atlassian/jira/9/9.4.28/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.28/entrypoint.sh new file mode 100755 index 000000000..d87fa3063 --- /dev/null +++ b/linux/ecosystem/atlassian/jira/9/9.4.28/entrypoint.sh @@ -0,0 +1,113 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + set_home + # Now drop privileges + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi +else + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi +fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.3/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.3/Dockerfile index d3d23294c..d69b7d0ff 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.4.3/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.4.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.3/Dockerfile.jdk11 index a1c1e41d7..2fd6c40c8 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.3/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.4.3/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.4.3/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.3/docker-compose.yml index b65684368..90b0640c1 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.3/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.4.3/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.4.3" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.3-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.4.3-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.4.3/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.3/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.4.3/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.4.3/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.4/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.4/Dockerfile index d3d23294c..1774d91e3 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.4.4/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.4.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.4/Dockerfile.jdk11 index a1c1e41d7..725bce928 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.4/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.4.4/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.4 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.4.4/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.4/docker-compose.yml index b65684368..80a48ea55 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.4/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.4.4/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.4.4" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.4-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.4.4-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.4.4/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.4/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.4.4/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.4.4/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.5/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.5/Dockerfile index d3d23294c..3f348b7e7 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.5/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.4.5/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.4.5/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.5/Dockerfile.jdk11 index a1c1e41d7..10ab50219 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.5/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.4.5/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.5 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.4.5/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.5/docker-compose.yml index b65684368..05cb9255f 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.5/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.4.5/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.4.5" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.5-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.4.5-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.4.5/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.5/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.4.5/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.4.5/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.6/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.6/Dockerfile index d3d23294c..27b6b5f89 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.6/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.4.6/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.4.6/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.6/Dockerfile.jdk11 index a1c1e41d7..d72f6601e 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.6/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.4.6/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.6 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.4.6/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.6/docker-compose.yml index b65684368..b58c85380 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.6/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.4.6/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.4.6" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.6-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.4.6-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.4.6/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.6/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.4.6/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.4.6/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.7/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.7/Dockerfile index d3d23294c..bb09d9e5b 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.7/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.4.7/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.4.7/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.7/Dockerfile.jdk11 index a1c1e41d7..017ca5dc4 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.7/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.4.7/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.7 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.4.7/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.7/docker-compose.yml index b65684368..dd59c4731 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.7/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.4.7/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.4.7" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.7-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.4.7-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.4.7/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.7/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.4.7/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.4.7/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.8/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.8/Dockerfile index d3d23294c..04b4880b6 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.8/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.4.8/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.4.8/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.8/Dockerfile.jdk11 index a1c1e41d7..4ba803879 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.8/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.4.8/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.8 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.4.8/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.8/docker-compose.yml index b65684368..a4f755ace 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.8/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.4.8/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.4.8" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.8-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.4.8-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.4.8/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.8/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.4.8/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.4.8/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.4.9/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.4.9/Dockerfile index d3d23294c..6ab7bf37b 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.9/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.4.9/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.4.9/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.4.9/Dockerfile.jdk11 index a1c1e41d7..bd5ae0c4e 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.9/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.4.9/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.4.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.4.9/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.4.9/docker-compose.yml index b65684368..48e8f446f 100644 --- a/linux/ecosystem/atlassian/jira/9/9.4.9/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.4.9/docker-compose.yml @@ -1,17 +1,15 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.4.9" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.4.9-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.4.9-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/9/9.4.9/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.4.9/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.4.9/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.4.9/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.5.0/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.5.0/Dockerfile index d3d23294c..88573fdcd 100644 --- a/linux/ecosystem/atlassian/jira/9/9.5.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.5.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.5.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.5.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.5.0/Dockerfile.jdk11 index a1c1e41d7..1b5cec605 100644 --- a/linux/ecosystem/atlassian/jira/9/9.5.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.5.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.5.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.5.0/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.5.0/Dockerfile.jdk17 index fdd79def6..8e1290543 100644 --- a/linux/ecosystem/atlassian/jira/9/9.5.0/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.5.0/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.5.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.5.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.5.0/docker-compose.yml index 32c492ee6..1e5448930 100644 --- a/linux/ecosystem/atlassian/jira/9/9.5.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.5.0/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.5.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.5.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.5.0-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.5.0-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.5.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.5.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.5.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.5.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.5.1/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.5.1/Dockerfile index d3d23294c..1ea31d487 100644 --- a/linux/ecosystem/atlassian/jira/9/9.5.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.5.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.5.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.5.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.5.1/Dockerfile.jdk11 index a1c1e41d7..35c24580c 100644 --- a/linux/ecosystem/atlassian/jira/9/9.5.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.5.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.5.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.5.1/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.5.1/Dockerfile.jdk17 index fdd79def6..3410f0e4d 100644 --- a/linux/ecosystem/atlassian/jira/9/9.5.1/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.5.1/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.5.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.5.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.5.1/docker-compose.yml index 32c492ee6..68dd866fc 100644 --- a/linux/ecosystem/atlassian/jira/9/9.5.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.5.1/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.5.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.5.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.5.1-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.5.1-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.5.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.5.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.5.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.5.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.6.0/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.6.0/Dockerfile index d3d23294c..1ddce8f95 100644 --- a/linux/ecosystem/atlassian/jira/9/9.6.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.6.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.6.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.6.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.6.0/Dockerfile.jdk11 index a1c1e41d7..3fd0127d2 100644 --- a/linux/ecosystem/atlassian/jira/9/9.6.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.6.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.6.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.6.0/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.6.0/Dockerfile.jdk17 index fdd79def6..8725b2f1b 100644 --- a/linux/ecosystem/atlassian/jira/9/9.6.0/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.6.0/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.6.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.6.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.6.0/docker-compose.yml index 32c492ee6..62c822337 100644 --- a/linux/ecosystem/atlassian/jira/9/9.6.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.6.0/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.6.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.6.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.6.0-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.6.0-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.6.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.6.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.6.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.6.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.7.0/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.7.0/Dockerfile index d3d23294c..29aa6e89a 100644 --- a/linux/ecosystem/atlassian/jira/9/9.7.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.7.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.7.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.7.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.7.0/Dockerfile.jdk11 index a1c1e41d7..e9545ffb2 100644 --- a/linux/ecosystem/atlassian/jira/9/9.7.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.7.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.7.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.7.0/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.7.0/Dockerfile.jdk17 index fdd79def6..a6d14fbf0 100644 --- a/linux/ecosystem/atlassian/jira/9/9.7.0/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.7.0/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.7.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.7.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.7.0/docker-compose.yml index 32c492ee6..15f2adc22 100644 --- a/linux/ecosystem/atlassian/jira/9/9.7.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.7.0/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.7.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.7.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.7.0-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.7.0-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.7.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.7.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.7.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.7.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.7.1/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.7.1/Dockerfile index d3d23294c..f629c72e9 100644 --- a/linux/ecosystem/atlassian/jira/9/9.7.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.7.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.7.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.7.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.7.1/Dockerfile.jdk11 index a1c1e41d7..1d8abf8b6 100644 --- a/linux/ecosystem/atlassian/jira/9/9.7.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.7.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.7.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.7.1/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.7.1/Dockerfile.jdk17 index fdd79def6..9263ed5f6 100644 --- a/linux/ecosystem/atlassian/jira/9/9.7.1/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.7.1/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.7.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.7.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.7.1/docker-compose.yml index 32c492ee6..39b97cb92 100644 --- a/linux/ecosystem/atlassian/jira/9/9.7.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.7.1/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.7.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.7.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.7.1-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.7.1-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.7.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.7.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.7.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.7.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.7.2/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.7.2/Dockerfile index d3d23294c..dfbb29bcb 100644 --- a/linux/ecosystem/atlassian/jira/9/9.7.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.7.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.7.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.7.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.7.2/Dockerfile.jdk11 index a1c1e41d7..c76c5b6ee 100644 --- a/linux/ecosystem/atlassian/jira/9/9.7.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.7.2/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.7.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.7.2/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.7.2/Dockerfile.jdk17 index fdd79def6..e6b37dc22 100644 --- a/linux/ecosystem/atlassian/jira/9/9.7.2/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.7.2/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.7.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.7.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.7.2/docker-compose.yml index 32c492ee6..8f8230701 100644 --- a/linux/ecosystem/atlassian/jira/9/9.7.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.7.2/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.7.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.7.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.7.2-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.7.2-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.7.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.7.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.7.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.7.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.8.0/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.8.0/Dockerfile index d3d23294c..d5aea64c0 100644 --- a/linux/ecosystem/atlassian/jira/9/9.8.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.8.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.8.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.8.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.8.0/Dockerfile.jdk11 index a1c1e41d7..da679a55c 100644 --- a/linux/ecosystem/atlassian/jira/9/9.8.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.8.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.8.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.8.0/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.8.0/Dockerfile.jdk17 index fdd79def6..73cdf816b 100644 --- a/linux/ecosystem/atlassian/jira/9/9.8.0/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.8.0/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.8.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.8.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.8.0/docker-compose.yml index 32c492ee6..31d5a06bd 100644 --- a/linux/ecosystem/atlassian/jira/9/9.8.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.8.0/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.8.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.8.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.8.0-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.8.0-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.8.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.8.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.8.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.8.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.8.1/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.8.1/Dockerfile index d3d23294c..cd59a305b 100644 --- a/linux/ecosystem/atlassian/jira/9/9.8.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.8.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.8.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.8.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.8.1/Dockerfile.jdk11 index a1c1e41d7..ce5a9eace 100644 --- a/linux/ecosystem/atlassian/jira/9/9.8.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.8.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.8.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.8.1/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.8.1/Dockerfile.jdk17 index fdd79def6..ca3e167db 100644 --- a/linux/ecosystem/atlassian/jira/9/9.8.1/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.8.1/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.8.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.8.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.8.1/docker-compose.yml index 32c492ee6..1a309a21d 100644 --- a/linux/ecosystem/atlassian/jira/9/9.8.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.8.1/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.8.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.8.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.8.1-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.8.1-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.8.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.8.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.8.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.8.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.8.2/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.8.2/Dockerfile index d3d23294c..bb2247b1c 100644 --- a/linux/ecosystem/atlassian/jira/9/9.8.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.8.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.8.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.8.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.8.2/Dockerfile.jdk11 index a1c1e41d7..787026d43 100644 --- a/linux/ecosystem/atlassian/jira/9/9.8.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.8.2/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.8.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.8.2/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.8.2/Dockerfile.jdk17 index fdd79def6..4931f6e61 100644 --- a/linux/ecosystem/atlassian/jira/9/9.8.2/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.8.2/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.8.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.8.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.8.2/docker-compose.yml index 32c492ee6..6819c201d 100644 --- a/linux/ecosystem/atlassian/jira/9/9.8.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.8.2/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.8.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.8.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.8.2-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.8.2-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.8.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.8.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.8.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.8.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.9.0/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.9.0/Dockerfile index d3d23294c..9ae94cc7f 100644 --- a/linux/ecosystem/atlassian/jira/9/9.9.0/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.9.0/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.9.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.9.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.9.0/Dockerfile.jdk11 index a1c1e41d7..9fad915b4 100644 --- a/linux/ecosystem/atlassian/jira/9/9.9.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.9.0/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.9.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.9.0/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.9.0/Dockerfile.jdk17 index fdd79def6..6b33f669f 100644 --- a/linux/ecosystem/atlassian/jira/9/9.9.0/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.9.0/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.9.0 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.9.0/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.9.0/docker-compose.yml index 32c492ee6..0ef1a21ab 100644 --- a/linux/ecosystem/atlassian/jira/9/9.9.0/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.9.0/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.9.0" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.9.0-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.9.0-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.9.0-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.9.0/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.9.0/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.9.0/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.9.0/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.9.1/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.9.1/Dockerfile index d3d23294c..fe8848bd6 100644 --- a/linux/ecosystem/atlassian/jira/9/9.9.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.9.1/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.9.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.9.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.9.1/Dockerfile.jdk11 index a1c1e41d7..cb5077cd0 100644 --- a/linux/ecosystem/atlassian/jira/9/9.9.1/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.9.1/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.9.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.9.1/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.9.1/Dockerfile.jdk17 index fdd79def6..d558839e3 100644 --- a/linux/ecosystem/atlassian/jira/9/9.9.1/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.9.1/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.9.1 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.9.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.9.1/docker-compose.yml index 32c492ee6..3749d32ca 100644 --- a/linux/ecosystem/atlassian/jira/9/9.9.1/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.9.1/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.9.1" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.9.1-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.9.1-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.9.1-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.9.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.9.1/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.9.1/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.9.1/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/9/9.9.2/Dockerfile b/linux/ecosystem/atlassian/jira/9/9.9.2/Dockerfile index d3d23294c..b881c808c 100644 --- a/linux/ecosystem/atlassian/jira/9/9.9.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/9/9.9.2/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.9.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/9/9.9.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/9/9.9.2/Dockerfile.jdk11 index a1c1e41d7..ce3c23ba9 100644 --- a/linux/ecosystem/atlassian/jira/9/9.9.2/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/9/9.9.2/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.9.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.9.2/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/9/9.9.2/Dockerfile.jdk17 index fdd79def6..a35bb5374 100644 --- a/linux/ecosystem/atlassian/jira/9/9.9.2/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/9/9.9.2/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.9.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/9/9.9.2/docker-compose.yml b/linux/ecosystem/atlassian/jira/9/9.9.2/docker-compose.yml index 32c492ee6..92d36ef83 100644 --- a/linux/ecosystem/atlassian/jira/9/9.9.2/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/9/9.9.2/docker-compose.yml @@ -1,25 +1,20 @@ -#version: '3' +#version: '3.9' services: app: - image: "epicmorg/jira:${RELEASE}" + image: "epicmorg/jira:9.9.2" + build: + context: . + app-jdk8: + image: "epicmorg/jira:9.9.2-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: - image: "epicmorg/jira:${RELEASE}-jdk11" + image: "epicmorg/jira:9.9.2-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: - image: "epicmorg/jira:${RELEASE}-jdk17" + image: "epicmorg/jira:9.9.2-jdk17" build: context: . - dockerfile: Dockerfile.jdk17 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} + dockerfile: Dockerfile.jdk17 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/9/9.9.2/entrypoint.sh b/linux/ecosystem/atlassian/jira/9/9.9.2/entrypoint.sh index 50ee4ecd1..d87fa3063 100755 --- a/linux/ecosystem/atlassian/jira/9/9.9.2/entrypoint.sh +++ b/linux/ecosystem/atlassian/jira/9/9.9.2/entrypoint.sh @@ -72,6 +72,20 @@ if [ "${CLUSTERED}" == "true" ]; then set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" fi +function set_home { + echo "Setting up JIRA_HOME.." + + if [ -z "$JIRA_HOME" ]; then + echo "Variable JIRA_HOME is empty. Aborting" + exit 1 + fi + + echo "JIRA_HOME is: ${JIRA_HOME}" + + echo "Patchig jira-application.properties" + sed -i "s|^jira\.home *=.*|jira.home = ${JIRA_HOME}|" ${JIRA_INSTALL_DIR}/atlassian-jira/WEB-INF/classes/jira-application.properties + +} # Start Jira as the correct user if [ "${UID}" -eq 0 ]; then @@ -82,8 +96,18 @@ if [ "${UID}" -eq 0 ]; then chmod -R 700 "${JIRA_HOME}" && chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" fi + set_home # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" + else + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/startup.sh $@" + fi else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + set_home + if [ -f "$JIRA_INSTALL_DIR/bin/start-jira.sh" ]; then + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" + else + exec "$JIRA_INSTALL_DIR/bin/startup.sh" "$@" + fi fi diff --git a/linux/ecosystem/atlassian/jira/latest/Dockerfile b/linux/ecosystem/atlassian/jira/latest/Dockerfile index d3d23294c..d92145f73 100644 --- a/linux/ecosystem/atlassian/jira/latest/Dockerfile +++ b/linux/ecosystem/atlassian/jira/latest/Dockerfile @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.12.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,21 +28,20 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - RUN updatedb COPY entrypoint.sh /entrypoint.sh diff --git a/linux/ecosystem/atlassian/jira/latest/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/latest/Dockerfile.jdk11 index a1c1e41d7..486678be8 100644 --- a/linux/ecosystem/atlassian/jira/latest/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/jira/latest/Dockerfile.jdk11 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.12.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/latest/Dockerfile.jdk17 b/linux/ecosystem/atlassian/jira/latest/Dockerfile.jdk17 index a1c1e41d7..486678be8 100644 --- a/linux/ecosystem/atlassian/jira/latest/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/jira/latest/Dockerfile.jdk17 @@ -6,8 +6,8 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL +ARG RELEASE=9.12.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,16 +28,16 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xvzf /tmp/atlassian-jira-software-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* diff --git a/linux/ecosystem/atlassian/jira/latest/docker-compose.yml b/linux/ecosystem/atlassian/jira/latest/docker-compose.yml index c2505b36b..ea5a73b7d 100644 --- a/linux/ecosystem/atlassian/jira/latest/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/latest/docker-compose.yml @@ -4,22 +4,13 @@ services: image: "epicmorg/jira:latest" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk11: image: "epicmorg/jira:latest-jdk11" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} app-jdk17: image: "epicmorg/jira:latest-jdk17" build: context: . dockerfile: Dockerfile.jdk11 - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/ecosystem/postgres/latest/Dockerfile b/linux/ecosystem/postgres/latest/Dockerfile index 8b6351494..9a74866e2 100644 --- a/linux/ecosystem/postgres/latest/Dockerfile +++ b/linux/ecosystem/postgres/latest/Dockerfile @@ -17,10 +17,10 @@ RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* ENV LANG en_US.utf8 #################################################################################################################################### -# http://apt.postgresql.org/pub/repos/apt/pool/17/p/postgresql-17/ +# http://apt.postgresql.org/pub/repos/apt/pool/16/p/postgresql-16/ # https://docs.timescale.com/self-hosted/latest/upgrades/upgrade-pg/ #################################################################################################################################### -ENV PG_MAJOR 17 +ENV PG_MAJOR 16 ENV PG_STATS 2.1 RUN install -d /usr/share/postgresql-common/pgdg && \