diff --git a/.github/workflows/epicmorg.ecosystem.images.atlassian.crowd.01.yml b/.github/workflows/epicmorg.ecosystem.images.atlassian.crowd.01.yml index dbf49ae0a..2fe214156 100644 --- a/.github/workflows/epicmorg.ecosystem.images.atlassian.crowd.01.yml +++ b/.github/workflows/epicmorg.ecosystem.images.atlassian.crowd.01.yml @@ -11,15 +11,10 @@ jobs: strategy: matrix: version: [ - '1.3', - '1.3.2', - '1.3.3', - '1.4', '1.4.2', '1.4.3', '1.4.4', '1.4.7', - '1.4.8', '1.5', '1.5.1', '1.5.2', diff --git a/linux/ecosystem/atlassian/crowd/1/1.3.2/Dockerfile b/linux/ecosystem/atlassian/crowd/1/1.3.2/Dockerfile index 884a6f464..13554c032 100644 --- a/linux/ecosystem/atlassian/crowd/1/1.3.2/Dockerfile +++ b/linux/ecosystem/atlassian/crowd/1/1.3.2/Dockerfile @@ -36,11 +36,10 @@ RUN apt-get update && \ apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* RUN mkdir -p ${CROWD_INSTALL_DIR} ${CROWD_DB} /opt/atlassian/support /opt/atlassian/etc && \ - tar -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ + tar --ignore-zeros -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ sed -i -e '2s/^exec/cd "`dirname "$0"`" \&\& exec/' ${CROWD_INSTALL_DIR}/start_crowd.sh && \ - sed -i -e 's#exec "$PRGDIR"/"$EXECUTABLE" start "$@"#exec "$PRGDIR"/"$EXECUTABLE" run "$@"#g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/startup.sh && \ - 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ - sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/conf/server.xml && \ +# 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ +# sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/conf/server.xml && \ apt-get clean -y && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/linux/ecosystem/atlassian/crowd/1/1.3.2/Dockerfile.jdk7 b/linux/ecosystem/atlassian/crowd/1/1.3.2/Dockerfile.jdk7 index 6e36ebba6..d9b437fc2 100644 --- a/linux/ecosystem/atlassian/crowd/1/1.3.2/Dockerfile.jdk7 +++ b/linux/ecosystem/atlassian/crowd/1/1.3.2/Dockerfile.jdk7 @@ -36,11 +36,10 @@ RUN apt-get update && \ apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* RUN mkdir -p ${CROWD_INSTALL_DIR} ${CROWD_DB} /opt/atlassian/support /opt/atlassian/etc && \ - tar -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ + tar --ignore-zeros -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ sed -i -e '2s/^exec/cd "`dirname "$0"`" \&\& exec/' ${CROWD_INSTALL_DIR}/start_crowd.sh && \ - sed -i -e 's#exec "$PRGDIR"/"$EXECUTABLE" start "$@"#exec "$PRGDIR"/"$EXECUTABLE" run "$@"#g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/startup.sh && \ - 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ - sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/conf/server.xml && \ +# 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ +# sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/conf/server.xml && \ apt-get clean -y && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/linux/ecosystem/atlassian/crowd/1/1.3.3/Dockerfile b/linux/ecosystem/atlassian/crowd/1/1.3.3/Dockerfile index 5b59d77bf..893129749 100644 --- a/linux/ecosystem/atlassian/crowd/1/1.3.3/Dockerfile +++ b/linux/ecosystem/atlassian/crowd/1/1.3.3/Dockerfile @@ -36,11 +36,10 @@ RUN apt-get update && \ apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* RUN mkdir -p ${CROWD_INSTALL_DIR} ${CROWD_DB} /opt/atlassian/support /opt/atlassian/etc && \ - tar -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ + tar --ignore-zeros -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ sed -i -e '2s/^exec/cd "`dirname "$0"`" \&\& exec/' ${CROWD_INSTALL_DIR}/start_crowd.sh && \ - sed -i -e 's#exec "$PRGDIR"/"$EXECUTABLE" start "$@"#exec "$PRGDIR"/"$EXECUTABLE" run "$@"#g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/startup.sh && \ - 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ - sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/conf/server.xml && \ +# 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ +# sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/conf/server.xml && \ apt-get clean -y && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/linux/ecosystem/atlassian/crowd/1/1.3.3/Dockerfile.jdk7 b/linux/ecosystem/atlassian/crowd/1/1.3.3/Dockerfile.jdk7 index ac67c214c..5bbe59843 100644 --- a/linux/ecosystem/atlassian/crowd/1/1.3.3/Dockerfile.jdk7 +++ b/linux/ecosystem/atlassian/crowd/1/1.3.3/Dockerfile.jdk7 @@ -36,11 +36,10 @@ RUN apt-get update && \ apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* RUN mkdir -p ${CROWD_INSTALL_DIR} ${CROWD_DB} /opt/atlassian/support /opt/atlassian/etc && \ - tar -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ + tar --ignore-zeros -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ sed -i -e '2s/^exec/cd "`dirname "$0"`" \&\& exec/' ${CROWD_INSTALL_DIR}/start_crowd.sh && \ - sed -i -e 's#exec "$PRGDIR"/"$EXECUTABLE" start "$@"#exec "$PRGDIR"/"$EXECUTABLE" run "$@"#g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/startup.sh && \ - 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ - sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/conf/server.xml && \ +# 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ +# sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/conf/server.xml && \ apt-get clean -y && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/linux/ecosystem/atlassian/crowd/1/1.3/Dockerfile b/linux/ecosystem/atlassian/crowd/1/1.3/Dockerfile index efe6d0c30..ed0836753 100644 --- a/linux/ecosystem/atlassian/crowd/1/1.3/Dockerfile +++ b/linux/ecosystem/atlassian/crowd/1/1.3/Dockerfile @@ -36,11 +36,10 @@ RUN apt-get update && \ apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* RUN mkdir -p ${CROWD_INSTALL_DIR} ${CROWD_DB} /opt/atlassian/support /opt/atlassian/etc && \ - tar -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ + tar --ignore-zeros -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ sed -i -e '2s/^exec/cd "`dirname "$0"`" \&\& exec/' ${CROWD_INSTALL_DIR}/start_crowd.sh && \ - sed -i -e 's#exec "$PRGDIR"/"$EXECUTABLE" start "$@"#exec "$PRGDIR"/"$EXECUTABLE" run "$@"#g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/startup.sh && \ - 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ - sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/conf/server.xml && \ +# 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ +# sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/conf/server.xml && \ apt-get clean -y && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/linux/ecosystem/atlassian/crowd/1/1.3/Dockerfile.jdk7 b/linux/ecosystem/atlassian/crowd/1/1.3/Dockerfile.jdk7 index 0cac7fce3..3dfe8d812 100644 --- a/linux/ecosystem/atlassian/crowd/1/1.3/Dockerfile.jdk7 +++ b/linux/ecosystem/atlassian/crowd/1/1.3/Dockerfile.jdk7 @@ -36,11 +36,10 @@ RUN apt-get update && \ apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* RUN mkdir -p ${CROWD_INSTALL_DIR} ${CROWD_DB} /opt/atlassian/support /opt/atlassian/etc && \ - tar -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ + tar --ignore-zeros -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ sed -i -e '2s/^exec/cd "`dirname "$0"`" \&\& exec/' ${CROWD_INSTALL_DIR}/start_crowd.sh && \ - sed -i -e 's#exec "$PRGDIR"/"$EXECUTABLE" start "$@"#exec "$PRGDIR"/"$EXECUTABLE" run "$@"#g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/startup.sh && \ - 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ - sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/conf/server.xml && \ +# 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ +# sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/conf/server.xml && \ apt-get clean -y && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/linux/ecosystem/atlassian/crowd/1/1.4.8/.env b/linux/ecosystem/atlassian/crowd/1/1.4.8/.env deleted file mode 100644 index dc3fe37dd..000000000 --- a/linux/ecosystem/atlassian/crowd/1/1.4.8/.env +++ /dev/null @@ -1,3 +0,0 @@ -RELEASE=1.4.8 -DOWNLOAD_URL=https://www.atlassian.com/software/crowd/downloads/binary/atlassian-crowd-${RELEASE}.tar.gz -TEMP_ARCHIVE=/tmp/atlassian-crowd-${RELEASE}.tar.gz diff --git a/linux/ecosystem/atlassian/crowd/1/1.4.8/Dockerfile b/linux/ecosystem/atlassian/crowd/1/1.4.8/Dockerfile deleted file mode 100644 index b1727ad55..000000000 --- a/linux/ecosystem/atlassian/crowd/1/1.4.8/Dockerfile +++ /dev/null @@ -1,87 +0,0 @@ -FROM quay.io/epicmorg/debian:bookworm-jdk6 -LABEL maintainer="Atlassian Crowd Server Team; EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# ARGuments -################################################################## -ARG RELEASE=1.4.8 -ARG DOWNLOAD_URL=https://www.atlassian.com/software/crowd/downloads/binary/atlassian-crowd-${RELEASE}.tar.gz -ARG TEMP_ARCHIVE=/tmp/atlassian-crowd-${RELEASE}.tar.gz - -################################################################## -# Setup -################################################################## -ENV RUN_USER daemon -ENV RUN_GROUP daemon -ENV APP_NAME crowd - -#2004 -#ENV RUN_UID 0 -#ENV RUN_GID 0 - -# https://confluence.atlassian.com/crowd/important-directories-and-files-78676537.html -ENV CROWD_HOME /var/atlassian/application-data/crowd -ENV CROWD_INSTALL_DIR /opt/atlassian/crowd -ENV CROWD_DB ${CROWD_INSTALL_DIR}/database - -################################################################## -# Installing -################################################################## -ADD ${DOWNLOAD_URL} /tmp - -RUN apt-get update && \ - apt-get upgrade -y && \ - apt-get install -y --no-install-recommends fontconfig python3 python3-jinja2 tini && \ - apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* - -RUN mkdir -p ${CROWD_INSTALL_DIR} ${CROWD_DB} /opt/atlassian/support /opt/atlassian/etc && \ - tar -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ - sed -i -e '2s/^exec/cd "`dirname "$0"`" \&\& exec/' ${CROWD_INSTALL_DIR}/start_crowd.sh && \ - sed -i -e 's#exec "$PRGDIR"/"$EXECUTABLE" start "$@"#exec "$PRGDIR"/"$EXECUTABLE" run "$@"#g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/startup.sh && \ - 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ - sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/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/* - -COPY entrypoint.sh / -#COPY shutdown-wait.sh / -#COPY shared-components/image/entrypoint_helpers.py / -#COPY shared-components/support /opt/atlassian/support -#COPY config/* /opt/atlassian/etc/ - -RUN chmod +x /entrypoint.sh && \ -# chmod +x /entrypoint.py && \ -# chmod +x /shutdown-wait.sh && \ -# chmod +x /entrypoint_helpers.py && \ - chown -R ${RUN_USER}:${RUN_GROUP} ${CROWD_INSTALL_DIR} - -################################################################## -# 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/* - -# Expose HTTP port -EXPOSE 8095 - -VOLUME ["${CROWD_HOME}"] # Must be declared after setting perms -VOLUME ["${CROWD_DB}"] # Must be declared after setting perms -WORKDIR ${CROWD_HOME} - -CMD ["/entrypoint.sh", "-fg"] -#CMD ["/entrypoint.py"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -RUN updatedb diff --git a/linux/ecosystem/atlassian/crowd/1/1.4.8/Dockerfile.jdk7 b/linux/ecosystem/atlassian/crowd/1/1.4.8/Dockerfile.jdk7 deleted file mode 100644 index 166eda377..000000000 --- a/linux/ecosystem/atlassian/crowd/1/1.4.8/Dockerfile.jdk7 +++ /dev/null @@ -1,87 +0,0 @@ -FROM quay.io/epicmorg/debian:bookworm-jdk7 -LABEL maintainer="Atlassian Crowd Server Team; EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# ARGuments -################################################################## -ARG RELEASE=1.4.8 -ARG DOWNLOAD_URL=https://www.atlassian.com/software/crowd/downloads/binary/atlassian-crowd-${RELEASE}.tar.gz -ARG TEMP_ARCHIVE=/tmp/atlassian-crowd-${RELEASE}.tar.gz - -################################################################## -# Setup -################################################################## -ENV RUN_USER daemon -ENV RUN_GROUP daemon -ENV APP_NAME crowd - -#2004 -#ENV RUN_UID 0 -#ENV RUN_GID 0 - -# https://confluence.atlassian.com/crowd/important-directories-and-files-78676537.html -ENV CROWD_HOME /var/atlassian/application-data/crowd -ENV CROWD_INSTALL_DIR /opt/atlassian/crowd -ENV CROWD_DB ${CROWD_INSTALL_DIR}/database - -################################################################## -# Installing -################################################################## -ADD ${DOWNLOAD_URL} /tmp - -RUN apt-get update && \ - apt-get upgrade -y && \ - apt-get install -y --no-install-recommends fontconfig python3 python3-jinja2 tini && \ - apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* - -RUN mkdir -p ${CROWD_INSTALL_DIR} ${CROWD_DB} /opt/atlassian/support /opt/atlassian/etc && \ - tar -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ - sed -i -e '2s/^exec/cd "`dirname "$0"`" \&\& exec/' ${CROWD_INSTALL_DIR}/start_crowd.sh && \ - sed -i -e 's#exec "$PRGDIR"/"$EXECUTABLE" start "$@"#exec "$PRGDIR"/"$EXECUTABLE" run "$@"#g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/startup.sh && \ - 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ - sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/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/* - -COPY entrypoint.sh / -#COPY shutdown-wait.sh / -#COPY shared-components/image/entrypoint_helpers.py / -#COPY shared-components/support /opt/atlassian/support -#COPY config/* /opt/atlassian/etc/ - -RUN chmod +x /entrypoint.sh && \ -# chmod +x /entrypoint.py && \ -# chmod +x /shutdown-wait.sh && \ -# chmod +x /entrypoint_helpers.py && \ - chown -R ${RUN_USER}:${RUN_GROUP} ${CROWD_INSTALL_DIR} - -################################################################## -# 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/* - -# Expose HTTP port -EXPOSE 8095 - -VOLUME ["${CROWD_HOME}"] # Must be declared after setting perms -VOLUME ["${CROWD_DB}"] # Must be declared after setting perms -WORKDIR ${CROWD_HOME} - -CMD ["/entrypoint.sh", "-fg"] -#CMD ["/entrypoint.py"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -RUN updatedb diff --git a/linux/ecosystem/atlassian/crowd/1/1.4.8/Makefile b/linux/ecosystem/atlassian/crowd/1/1.4.8/Makefile deleted file mode 100644 index 1e4371492..000000000 --- a/linux/ecosystem/atlassian/crowd/1/1.4.8/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/crowd/1/1.4.8/README.md b/linux/ecosystem/atlassian/crowd/1/1.4.8/README.md deleted file mode 100644 index 3bdc16057..000000000 --- a/linux/ecosystem/atlassian/crowd/1/1.4.8/README.md +++ /dev/null @@ -1,311 +0,0 @@ -![Atlassian Crowd](https://wac-cdn.atlassian.com/dam/jcr:d2a1da52-ae52-4b06-9ab1-da8647a89653/crowd-icon-gradient-blue.svg?cdnVersion=696) - -Crowd provides single sign-on and user identity that's easy to use. - -Learn more about Crowd: [https://www.atlassian.com/software/crowd][1] - -# Contents - -[TOC] - -# Overview - -This Docker container makes it easy to get an instance of Crowd up and running. - -Note: ** Use docker version >= 20.10.10 ** - -# Quick Start - -For the `CROWD_HOME` directory that is used to store application data (amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/engine/tutorials/dockervolumes/#/data-volumes), or via a named volume. - -To get started you can use a data volume, or named volumes. In this example we'll use named volumes. - - docker volume create --name crowdVolume - docker run -v crowdVolume:/var/atlassian/application-data/crowd --name="crowd" -d -p 8095:8095 atlassian/crowd - - -**Success**. Crowd is now available on [http://localhost:8095](http://localhost:8095)* - -Please ensure your container has the necessary resources allocated to it. See [Supported Platforms][2] for further information. - - -_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8095` instead._ - -## Memory / Heap Size - -If you need to override Crowd's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables. - -* `JVM_MINIMUM_MEMORY` (default: 384m) - - The minimum heap size of the JVM - -* `JVM_MAXIMUM_MEMORY` (default: 768m) - - The maximum heap size of the JVM - -## Reverse Proxy Settings - -If Crowd is run behind a reverse proxy server as [described here][3], then you need to specify extra options to make Crowd aware of the setup. They can be controlled via the below environment variables. - -* `ATL_PROXY_NAME` (default: NONE) - - The reverse proxy's fully qualified hostname. `CATALINA_CONNECTOR_PROXYNAME` - is also supported for backwards compatability. - -* `ATL_PROXY_PORT` (default: NONE) - - The reverse proxy's port number via which Crowd is - accessed. `CATALINA_CONNECTOR_PROXYPORT` is also supported for backwards - compatability. - -* `ATL_TOMCAT_PORT` (default: 8095) - - The port for Tomcat/Crowd to listen on. Depending on your container - deployment method this port may need to be - [exposed and published][docker-expose]. - -* `ATL_TOMCAT_SCHEME` (default: http) - - The protocol via which Crowd is accessed. `CATALINA_CONNECTOR_SCHEME` is also - supported for backwards compatability. - -* `ATL_TOMCAT_SECURE` (default: false) - - Set 'true' if `ATL_TOMCAT_SCHEME` is 'https'. `CATALINA_CONNECTOR_SECURE` is - also supported for backwards compatability. - -The following Tomcat/Catalina options are also supported. For more information, -see https://tomcat.apache.org/tomcat-8.5-doc/config/index.html. - -* `ATL_TOMCAT_MGMT_PORT` (default: 8000) -* `ATL_TOMCAT_MAXTHREADS` (default: 100) -* `ATL_TOMCAT_MINSPARETHREADS` (default: 10) -* `ATL_TOMCAT_CONNECTIONTIMEOUT` (default: 20000) -* `ATL_TOMCAT_ENABLELOOKUPS` (default: false) -* `ATL_TOMCAT_PROTOCOL` (default: HTTP/1.1) -* `ATL_TOMCAT_ACCEPTCOUNT` (default: 10) -* `ATL_TOMCAT_MAXHTTPHEADERSIZE` (default: 8192) - -## JVM Configuration - -If you need to pass additional JVM arguments to Crowd, such as specifying a custom trust store, you can add them via the below environment variable - -* `JVM_SUPPORT_RECOMMENDED_ARGS` - - Additional JVM arguments for Crowd - -Example: - - docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/crowd/cacerts -v crowdVolume:/var/atlassian/application-data/crowd --name="crowd" -d -p 8095:8095 atlassian/crowd - -## Data Center configuration - -This docker image can be run as part of a [Data Center][4] cluster. You can -specify the following properties to start Crowd as a Data Center node, -instead of manually configuring a cluster. See [Installing Crowd Data -Center][5] for more information. - -## Container Configuration - -* `SET_PERMISSIONS` (default: true) - - Define whether to set home directory permissions on startup. Set to `false` to disable - this behaviour. - -## Advanced Configuration - -As mentioned at the top of this section, the settings from the environment are -used to populate the application configuration on the container startup. However -in some cases you may wish to customise the settings in ways that are not -supported by the environment variables above. In this case, it is possible to -modify the base templates to add your own configuration. There are three main -ways of doing this; modify our repository to your own image, build a new image -from the existing one, or provide new templates at startup. We will briefly -outline this methods here, but in practice how you do this will depend on your -needs. - -#### Building your own image - -* Clone the Atlassian repository at https://bitbucket.org/atlassian-docker/docker-atlassian-crowd/ -* Modify or replace the [Jinja](https://jinja.palletsprojects.com/) templates - under `config`; _NOTE_: The files must have the `.j2` extensions. However you - don't have to use template variables if you don't wish. -* Build the new image with e.g: `docker build --tag my-crowd-image --build-arg CROWD_VERSION=3.x.x .` -* Optionally push to a registry, and deploy. - -#### Build a new image from the existing one - -* Create a new `Dockerfile`, which starts with the Atlassian Crowd base image e.g: `FROM atlassian/crowd:latest`. -* Use a `COPY` line to overwrite the provided templates. -* Build, push and deploy the new image as above. - -#### Overwrite the templates at runtime - -There are two main ways of doing this: - -* If your container is going to be long-lived, you can create it, modify the - installed templates under `/opt/atlassian/etc/`, and then run it. -* Alternatively, you can create a volume containing your alternative templates, - and mount it over the provided templates at runtime - with `--volume my-config:/opt/atlassian/etc/`. - -# Shared directory and user IDs - -By default the Crowd application runs as the user `crowd`, with a UID -and GID of 2004. Consequently this UID must have write access to the shared -filesystem. If for some reason a different UID must be used, there are a number -of options available: - -* The Docker image can be rebuilt with a different UID. -* Under Linux, the UID can be remapped using - [user namespace remapping][7]. - -To preserve strict permissions for certain configuration files, this container starts as -`root` to perform bootstrapping before running Crowd under a non-privileged user -account. If you wish to start the container as a non-root user, please note that Tomcat -configuration will be skipped and a warning will be logged. You may still apply custom -configuration in this situation by mounting configuration files directly, e.g. -by mounting your own server.xml file directly to -`/opt/atlassian/crowd/apache-tomcat/conf/server.xml` - -# Upgrade - -To upgrade to a more recent version of Crowd you can simply stop the `crowd` container and start a new one based on a more recent image: - - docker stop crowd - docker rm crowd - docker run ... (See above) - -As your data is stored in the data volume directory on the host it will still be available after the upgrade. - -_Note: Please make sure that you **don't** accidentally remove the `crowd` container and its volumes using the `-v` option._ - -# Backup - -For evaluations you can use the built-in database that will store its files in the Crowd home directory. In that case it is sufficient to create a backup archive of the docker volume. - -If you're using an external database, you can configure Crowd to make a backup automatically each night. This will back up the current state, including the database to the `crowdVolume` docker volume, which can then be archived. Alternatively you can backup the database separately, and continue to create a backup archive of the docker volume to back up the Crowd Home directory. - -Read more about data recovery and backups: [Backing Up and Restoring Data][6] - -# Versioning - -The `latest` tag matches the most recent release of Atlassian Crowd. Thus `atlassian/crowd:latest` will use the newest version of Crowd available. - -Alternatively you can use a specific major, major.minor, or major.minor.patch version of Crowd by using a version number tag: - -* `atlassian/crowd:3` -* `atlassian/crowd:3.2` -* `atlassian/crowd:3.2.3` - -All versions from 3.0+ are available - -# Supported JDK versions - -All the Atlassian Docker images are now JDK11 only, and generated from the -[official Eclipse Temurin OpenJDK Docker images](https://hub.docker.com/_/eclipse-temurin). - -The Docker images follow the [Atlassian Support end-of-life -policy](https://confluence.atlassian.com/support/atlassian-support-end-of-life-policy-201851003.html); -images for unsupported versions of the products remain available but will no longer -receive updates or fixes. - -Historically, we have also generated other versions of the images, including -JDK8, Alpine, and 'slim' versions of the JDK. These legacy images still exist in -Docker Hub, however they should be considered deprecated, and do not receive -updates or fixes. - -If for some reason you need a different version, see "Building your own image" -above. - -# Supported architectures - -Currently the Atlassian Docker images are built for the `linux/amd64` target -platform; we do not have other architectures on our roadmap at this -point. However the Dockerfiles and support tooling have now had all -architecture-specific components removed, so if necessary it is possible to -build images for any platform supported by Docker. - -## Building on the target architecture - -Note: This method is known to work on Mac M1 and AWS ARM64 machines, but has not -be extensively tested. - -The simplest method of getting a platform image is to build it on a target -machine. The following assumes you have git and Docker installed. You will also -need to know which version of Crowd you want to build; substitute -`CROWD_VERSION=x.x.x` with your required version: - -``` -git clone --recurse-submodule https://bitbucket.org/atlassian-docker/docker-atlassian-crowd.git -cd docker-atlassian-crowd -docker build --tag my-image --build-arg CROWD_VERSION=x.x.x . -``` -This image can be pushed up to your own Docker Hub or private repository. - -# Troubleshooting - -These images include built-in scripts to assist in performing common JVM diagnostic tasks. - -## Thread dumps - -`/opt/atlassian/support/thread-dumps.sh` can be run via `docker exec` to easily trigger the collection of thread -dumps from the containerized application. For example: - - docker exec my_crowd /opt/atlassian/support/thread-dumps.sh - -By default this script will collect 10 thread dumps at 5 second intervals. This can -be overridden by passing a custom value for the count and interval, by using `-c` / `--count` -and `-i` / `--interval` respectively. For example, to collect 20 thread dumps at 3 second intervals: - - docker exec my_container /opt/atlassian/support/thread-dumps.sh --count 20 --interval 3 - -Thread dumps will be written to `$APP_HOME/thread_dumps/`. - -Note: By default this script will also capture output from top run in 'Thread-mode'. This can -be disabled by passing `-n` / `--no-top` - -## Heap dump - -`/opt/atlassian/support/heap-dump.sh` can be run via `docker exec` to easily trigger the collection of a heap -dump from the containerized application. For example: - - docker exec my_container /opt/atlassian/support/heap-dump.sh - -A heap dump will be written to `$APP_HOME/heap.bin`. If a file already exists at this -location, use `-f` / `--force` to overwrite the existing heap dump file. - -## Manual diagnostics - -The `jcmd` utility is also included in these images and can be used by starting a `bash` shell -in the running container: - - docker exec -it my_container /bin/bash - -# Support - -For product support, go to: - -* https://support.atlassian.com/crowd/ - -You can also visit the [Atlassian Data Center on -Kubernetes](https://community.atlassian.com/t5/Atlassian-Data-Center-on/gh-p/DC_Kubernetes) -forum for discussion on running Atlassian Data Center products in containers. - -# Changelog - -For a detailed list of changes to the Docker image configuration see [the Git -commit history](https://bitbucket.org/atlassian-docker/docker-atlassian-crowd/commits/). - -# License - -Copyright © 2019 Atlassian Corporation Pty Ltd. -Licensed under the Apache License, Version 2.0. - -[1]: https://www.atlassian.com/software/crowd -[2]: https://confluence.atlassian.com/crowd/supported-platforms-191851.html -[3]: https://confluence.atlassian.com/crowd031/integrating-crowd-with-apache-949753124.html -[4]: https://confluence.atlassian.com/crowd/crowd-data-center-935372453.html -[5]: https://confluence.atlassian.com/crowd/installing-crowd-data-center-935369773.html -[6]: https://confluence.atlassian.com/crowd/backing-up-and-restoring-data-36470797.html -[7]: https://docs.docker.com/engine/security/userns-remap/ diff --git a/linux/ecosystem/atlassian/crowd/1/1.4.8/docker-compose.yml b/linux/ecosystem/atlassian/crowd/1/1.4.8/docker-compose.yml deleted file mode 100644 index c3fca803d..000000000 --- a/linux/ecosystem/atlassian/crowd/1/1.4.8/docker-compose.yml +++ /dev/null @@ -1,14 +0,0 @@ -services: - app: - image: "quay.io/epicmorg/crowd:1.4.8" - build: - context: . - app-jdk6: - image: "quay.io/epicmorg/crowd:1.4.8-jdk6" - build: - context: . - app-jdk7: - image: "quay.io/epicmorg/crowd:1.4.8-jdk7" - build: - context: . - dockerfile: Dockerfile.jdk7 diff --git a/linux/ecosystem/atlassian/crowd/1/1.4.8/entrypoint.sh b/linux/ecosystem/atlassian/crowd/1/1.4.8/entrypoint.sh deleted file mode 100755 index 66f97b77a..000000000 --- a/linux/ecosystem/atlassian/crowd/1/1.4.8/entrypoint.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -set -euo pipefail - -# 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}" - - -# Start Bamboo 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" "${CROWD_HOME}") - EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 - if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then - chmod -R 700 "${CROWD_HOME}" && - chown -R "${RUN_USER}:${RUN_GROUP}" "${CROWD_HOME}" - fi - # Now drop privileges - cd /opt/atlassian/crowd - exec su -s /bin/bash "${RUN_USER}" -c "$CROWD_INSTALL_DIR/start_crowd.sh $@" -else - cd /opt/atlassian/crowd - exec "$CROWD_INSTALL_DIR/start_crowd.sh" "$@" -fi diff --git a/linux/ecosystem/atlassian/crowd/1/1.4/Dockerfile b/linux/ecosystem/atlassian/crowd/1/1.4/Dockerfile index 55040c114..30e9093dc 100644 --- a/linux/ecosystem/atlassian/crowd/1/1.4/Dockerfile +++ b/linux/ecosystem/atlassian/crowd/1/1.4/Dockerfile @@ -36,11 +36,10 @@ RUN apt-get update && \ apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* RUN mkdir -p ${CROWD_INSTALL_DIR} ${CROWD_DB} /opt/atlassian/support /opt/atlassian/etc && \ - tar -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ + tar --ignore-zeros -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ sed -i -e '2s/^exec/cd "`dirname "$0"`" \&\& exec/' ${CROWD_INSTALL_DIR}/start_crowd.sh && \ - sed -i -e 's#exec "$PRGDIR"/"$EXECUTABLE" start "$@"#exec "$PRGDIR"/"$EXECUTABLE" run "$@"#g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/startup.sh && \ - 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ - sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/conf/server.xml && \ +# 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ +# sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/conf/server.xml && \ apt-get clean -y && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/linux/ecosystem/atlassian/crowd/1/1.4/Dockerfile.jdk7 b/linux/ecosystem/atlassian/crowd/1/1.4/Dockerfile.jdk7 index fc8765312..049e0eb57 100644 --- a/linux/ecosystem/atlassian/crowd/1/1.4/Dockerfile.jdk7 +++ b/linux/ecosystem/atlassian/crowd/1/1.4/Dockerfile.jdk7 @@ -36,11 +36,10 @@ RUN apt-get update && \ apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* RUN mkdir -p ${CROWD_INSTALL_DIR} ${CROWD_DB} /opt/atlassian/support /opt/atlassian/etc && \ - tar -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ + tar --ignore-zeros -xzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${CROWD_INSTALL_DIR}" && \ sed -i -e '2s/^exec/cd "`dirname "$0"`" \&\& exec/' ${CROWD_INSTALL_DIR}/start_crowd.sh && \ - sed -i -e 's#exec "$PRGDIR"/"$EXECUTABLE" start "$@"#exec "$PRGDIR"/"$EXECUTABLE" run "$@"#g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/startup.sh && \ - 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ - sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/conf/server.xml && \ +# 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} -Dcrowd.home=\${CROWD_HOME}/g' ${CROWD_INSTALL_DIR}/apache-tomcat/bin/setenv.sh && \ +# sed -i -e 's/port="8095"/port="8095" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CROWD_INSTALL_DIR}/apache-tomcat/conf/server.xml && \ apt-get clean -y && \ apt-get autoremove -y && \ apt-get autoclean -y && \