From 5ecb1f8f57f812ff74bd6e837ca62540582016d0 Mon Sep 17 00:00:00 2001 From: STAM Date: Mon, 28 Apr 2025 15:29:01 +0300 Subject: [PATCH] confluence gha fix --- ...osystem.images.atlassian.confluence.09.yml | 1 - .../files/versions/confluence/9.jdk17-21.txt | 1 - .../atlassian/confluence/9/9.0.0/.env | 3 - .../atlassian/confluence/9/9.0.0/Dockerfile | 64 ------------------- .../confluence/9/9.0.0/Dockerfile.jdk21 | 64 ------------------- .../atlassian/confluence/9/9.0.0/Makefile | 44 ------------- .../confluence/9/9.0.0/docker-compose.yml | 14 ---- .../confluence/9/9.0.0/entrypoint.sh | 39 ----------- 8 files changed, 230 deletions(-) delete mode 100644 linux/ecosystem/atlassian/confluence/9/9.0.0/.env delete mode 100644 linux/ecosystem/atlassian/confluence/9/9.0.0/Dockerfile delete mode 100644 linux/ecosystem/atlassian/confluence/9/9.0.0/Dockerfile.jdk21 delete mode 100644 linux/ecosystem/atlassian/confluence/9/9.0.0/Makefile delete mode 100644 linux/ecosystem/atlassian/confluence/9/9.0.0/docker-compose.yml delete mode 100755 linux/ecosystem/atlassian/confluence/9/9.0.0/entrypoint.sh diff --git a/.github/workflows/epicmorg.ecosystem.images.atlassian.confluence.09.yml b/.github/workflows/epicmorg.ecosystem.images.atlassian.confluence.09.yml index b5441c9ae..8bbe06d4a 100644 --- a/.github/workflows/epicmorg.ecosystem.images.atlassian.confluence.09.yml +++ b/.github/workflows/epicmorg.ecosystem.images.atlassian.confluence.09.yml @@ -11,7 +11,6 @@ jobs: strategy: matrix: version: [ - '9.0.0', '9.0.1', '9.0.2', '9.0.3', diff --git a/bin/ansible/roles/common/files/versions/confluence/9.jdk17-21.txt b/bin/ansible/roles/common/files/versions/confluence/9.jdk17-21.txt index 99cff3bee..6060d948f 100644 --- a/bin/ansible/roles/common/files/versions/confluence/9.jdk17-21.txt +++ b/bin/ansible/roles/common/files/versions/confluence/9.jdk17-21.txt @@ -1,4 +1,3 @@ -9.0.0 9.0.1 9.0.2 9.0.3 diff --git a/linux/ecosystem/atlassian/confluence/9/9.0.0/.env b/linux/ecosystem/atlassian/confluence/9/9.0.0/.env deleted file mode 100644 index 847ffc4e1..000000000 --- a/linux/ecosystem/atlassian/confluence/9/9.0.0/.env +++ /dev/null @@ -1,3 +0,0 @@ -RELEASE=9.0.0 -DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${RELEASE}.tar.gz -TEMP_ARCHIVE=/tmp/atlassian-confluence-${RELEASE}.tar.gz diff --git a/linux/ecosystem/atlassian/confluence/9/9.0.0/Dockerfile b/linux/ecosystem/atlassian/confluence/9/9.0.0/Dockerfile deleted file mode 100644 index 77133e755..000000000 --- a/linux/ecosystem/atlassian/confluence/9/9.0.0/Dockerfile +++ /dev/null @@ -1,64 +0,0 @@ -FROM quay.io/epicmorg/debian:bookworm-jdk17 -LABEL maintainer="Atlassian Confluence Server Team; EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# ARGuments -################################################################## -ARG RELEASE=9.0.0 -ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${RELEASE}.tar.gz -ARG TEMP_ARCHIVE=/tmp/atlassian-confluence-${RELEASE}.tar.gz - -################################################################## -# Setup -################################################################## -ENV RUN_USER daemon -ENV RUN_GROUP daemon - -# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html -ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence -ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence - -VOLUME ["${CONFLUENCE_HOME}"] -WORKDIR $CONFLUENCE_HOME - -# Expose HTTP and Synchrony ports -EXPOSE 8090 -EXPOSE 8091 - -################################################################## -# Installing -################################################################## -ADD ${DOWNLOAD_URL} /tmp -RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} && \ - tar -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CONFLUENCE_INSTALL_DIR}" && \ - chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ && \ - sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh && \ - sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ - apt-get clean -y && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ - rm -rfv /tmp/* - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ - rm -rfv /tmp/* - -COPY entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh - -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -RUN updatedb diff --git a/linux/ecosystem/atlassian/confluence/9/9.0.0/Dockerfile.jdk21 b/linux/ecosystem/atlassian/confluence/9/9.0.0/Dockerfile.jdk21 deleted file mode 100644 index 048a8e9e9..000000000 --- a/linux/ecosystem/atlassian/confluence/9/9.0.0/Dockerfile.jdk21 +++ /dev/null @@ -1,64 +0,0 @@ -FROM quay.io/epicmorg/debian:bookworm-jdk21 -LABEL maintainer="Atlassian Confluence Server Team; EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# ARGuments -################################################################## -ARG RELEASE=9.0.0 -ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${RELEASE}.tar.gz -ARG TEMP_ARCHIVE=/tmp/atlassian-confluence-${RELEASE}.tar.gz - -################################################################## -# Setup -################################################################## -ENV RUN_USER daemon -ENV RUN_GROUP daemon - -# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html -ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence -ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence - -VOLUME ["${CONFLUENCE_HOME}"] -WORKDIR $CONFLUENCE_HOME - -# Expose HTTP and Synchrony ports -EXPOSE 8090 -EXPOSE 8091 - -################################################################## -# Installing -################################################################## -ADD ${DOWNLOAD_URL} /tmp -RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} && \ - tar -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CONFLUENCE_INSTALL_DIR}" && \ - chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ && \ - sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh && \ - sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ - apt-get clean -y && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ - rm -rfv /tmp/* - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /root/tmp/* && \ - rm -rfv /tmp/* - -COPY entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh - -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -RUN updatedb diff --git a/linux/ecosystem/atlassian/confluence/9/9.0.0/Makefile b/linux/ecosystem/atlassian/confluence/9/9.0.0/Makefile deleted file mode 100644 index 1e4371492..000000000 --- a/linux/ecosystem/atlassian/confluence/9/9.0.0/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -all: app - -app: - make pip - make build - make deploy - make clean - -build: - make build-buildah - -deploy: - make deploy-buildah - -build-buildah: - buildah-wrapper --build - -deploy-buildah: - buildah-wrapper --deploy - -build-kaniko: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run - -deploy-kaniko: - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug - -build-compose: - docker-compose build --compress --parallel --progress plain - -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 - buildah rm -a - buildah rmi -a - -pip: - pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper - pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/atlassian/confluence/9/9.0.0/docker-compose.yml b/linux/ecosystem/atlassian/confluence/9/9.0.0/docker-compose.yml deleted file mode 100644 index e9523b7eb..000000000 --- a/linux/ecosystem/atlassian/confluence/9/9.0.0/docker-compose.yml +++ /dev/null @@ -1,14 +0,0 @@ -services: - app: - image: "quay.io/epicmorg/confluence:9.0.0" - build: - context: . - app-jdk17: - image: "quay.io/epicmorg/confluence:9.0.0-jdk17" - build: - context: . - app-jdk21: - image: "quay.io/epicmorg/confluence:9.0.0-jdk21" - build: - context: . - dockerfile: Dockerfile.jdk21 \ No newline at end of file diff --git a/linux/ecosystem/atlassian/confluence/9/9.0.0/entrypoint.sh b/linux/ecosystem/atlassian/confluence/9/9.0.0/entrypoint.sh deleted file mode 100755 index 250fc031a..000000000 --- a/linux/ecosystem/atlassian/confluence/9/9.0.0/entrypoint.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/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:=} - -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 CATALINA_OPTS - - -# Start Confluence 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" "${CONFLUENCE_HOME}") - EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 - if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then - chmod -R 700 "${CONFLUENCE_HOME}" && - chown -R "${RUN_USER}:${RUN_GROUP}" "${CONFLUENCE_HOME}" - fi - # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh $@" -else - exec "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh" "$@" -fi