From 3d4add5777c8204171b5aeada067c13430166b8d Mon Sep 17 00:00:00 2001 From: NiTRoeSE Date: Tue, 28 Jan 2020 14:40:52 +0100 Subject: [PATCH 1/3] Update to rundeck 3.2.1 --- Dockerfile | 106 ++++++++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2ecab00..55a17da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,53 +1,53 @@ -# Dockerfile for rundeck -# https://github.com/jjethwa/rundeck - -FROM debian:stretch - -MAINTAINER Jordan Jethwa - -ENV SERVER_URL=https://localhost:4443 \ - RUNDECK_STORAGE_PROVIDER=file \ - RUNDECK_PROJECT_STORAGE_TYPE=file \ - NO_LOCAL_MYSQL=false \ - LOGIN_MODULE=RDpropertyfilelogin \ - JAAS_CONF_FILE=jaas-loginmodule.conf \ - KEYSTORE_PASS=adminadmin \ - TRUSTSTORE_PASS=adminadmin \ - CLUSTER_MODE=false - -RUN export DEBIAN_FRONTEND=noninteractive && \ - echo "deb http://ftp.debian.org/debian stretch-backports main" >> /etc/apt/sources.list && \ - apt-get -qq update && \ - apt-get -qqy install -t stretch-backports --no-install-recommends bash openjdk-8-jre-headless ca-certificates-java supervisor procps sudo ca-certificates openssh-client mysql-server mysql-client postgresql-9.6 postgresql-client-9.6 pwgen curl git uuid-runtime parallel jq && \ - cd /tmp/ && \ - curl -Lo /tmp/rundeck.deb https://dl.bintray.com/rundeck/rundeck-deb/rundeck_3.2.0.20191218-1_all.deb && \ - echo 'f361c523bc9e82dbdea42e49b8ce3139e95111bd8c37b78a32adc148adcd6265 rundeck.deb' > /tmp/rundeck.sig && \ - shasum -a256 -c /tmp/rundeck.sig && \ - curl -Lo /tmp/rundeck-cli.deb https://dl.bintray.com/rundeck/rundeck-deb/rundeck-cli_1.1.7-1_all.deb && \ - echo 'd8f39c3cebcf3ed16d138cbd18e014303fef27234c32d276a1cf1462f7c250da rundeck-cli.deb' > /tmp/rundeck-cli.sig && \ - shasum -a256 -c /tmp/rundeck-cli.sig && \ - cd - && \ - dpkg -i /tmp/rundeck*.deb && rm /tmp/rundeck*.deb && \ - mkdir -p /tmp/rundeck && \ - chown rundeck:rundeck /tmp/rundeck && \ - mkdir -p /var/lib/rundeck/.ssh && \ - chown rundeck:rundeck /var/lib/rundeck/.ssh && \ - sed -i "s/export RDECK_JVM=\"/export RDECK_JVM=\"\${RDECK_JVM} /" /etc/rundeck/profile && \ - curl -Lo /var/lib/rundeck/libext/rundeck-slack-incoming-webhook-plugin-0.11.jar https://github.com/higanworks/rundeck-slack-incoming-webhook-plugin/releases/download/v0.11.dev/rundeck-slack-incoming-webhook-plugin-0.11.jar && \ - echo 'efce8fa7891371bb8540b55d7eef645741566d411b3dbed43e9b7fe2e4d099a0 rundeck-slack-incoming-webhook-plugin-0.11.jar' > /tmp/rundeck-slack-plugin.sig && \ - cd /var/lib/rundeck/libext/ && \ - shasum -a256 -c /tmp/rundeck-slack-plugin.sig && \ - cd - && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -ADD content/ / -RUN chmod u+x /opt/run && \ - mkdir -p /var/log/supervisor && mkdir -p /opt/supervisor && \ - chmod u+x /opt/supervisor/rundeck && chmod u+x /opt/supervisor/mysql_supervisor && chmod u+x /opt/supervisor/fatalservicelistener - -EXPOSE 4440 4443 - -VOLUME ["/etc/rundeck", "/var/rundeck", "/var/lib/mysql", "/var/log/rundeck", "/opt/rundeck-plugins", "/var/lib/rundeck/logs", "/var/lib/rundeck/var/storage"] - -ENTRYPOINT ["/opt/run"] + # Dockerfile for rundeck + # https://github.com/jjethwa/rundeck + + FROM debian:stretch + + MAINTAINER Jordan Jethwa + + ENV SERVER_URL=https://localhost:4443 \ + RUNDECK_STORAGE_PROVIDER=file \ + RUNDECK_PROJECT_STORAGE_TYPE=file \ + NO_LOCAL_MYSQL=false \ + LOGIN_MODULE=RDpropertyfilelogin \ + JAAS_CONF_FILE=jaas-loginmodule.conf \ + KEYSTORE_PASS=adminadmin \ + TRUSTSTORE_PASS=adminadmin \ + CLUSTER_MODE=false + + RUN export DEBIAN_FRONTEND=noninteractive && \ + echo "deb http://ftp.debian.org/debian stretch-backports main" >> /etc/apt/sources.list && \ + apt-get -qq update && \ + apt-get -qqy install -t stretch-backports --no-install-recommends bash openjdk-8-jre-headless ca-certificates-java supervisor procps sudo ca-certificates openssh-client mysql-server mysql-client postgresql-9.6 postgresql-client-9.6 pwgen curl git uuid-runtime parallel jq && \ + cd /tmp/ && \ + curl -Lo /tmp/rundeck.deb https://dl.bintray.com/rundeck/rundeck-deb/rundeck_3.2.1.20200113-1_all.deb && \ + echo '6809dbe006fc3589b711365f9a160e9331be178056471613b75d77c1f57fe49c rundeck.deb' > /tmp/rundeck.sig && \ + shasum -a256 -c /tmp/rundeck.sig && \ + curl -Lo /tmp/rundeck-cli.deb https://github.com/rundeck/rundeck-cli/releases/download/v1.1.7/rundeck-cli_1.1.7-1_all.deb && \ + echo 'ba5078167d1efb5dc89ad74eb89a2d93283b796e1286b918141c6df000683c2e rundeck-cli.deb' > /tmp/rundeck-cli.sig && \ + shasum -a256 -c /tmp/rundeck-cli.sig && \ + cd - && \ + dpkg -i /tmp/rundeck*.deb && rm /tmp/rundeck*.deb && \ + mkdir -p /tmp/rundeck && \ + chown rundeck:rundeck /tmp/rundeck && \ + mkdir -p /var/lib/rundeck/.ssh && \ + chown rundeck:rundeck /var/lib/rundeck/.ssh && \ + sed -i "s/export RDECK_JVM=\"/export RDECK_JVM=\"\${RDECK_JVM} /" /etc/rundeck/profile && \ + curl -Lo /var/lib/rundeck/libext/rundeck-slack-incoming-webhook-plugin-0.11.jar https://github.com/higanworks/rundeck-slack-incoming-webhook-plugin/releases/download/v0.11.dev/rundeck-slack-incoming-webhook-plugin-0.11.jar && \ + echo 'efce8fa7891371bb8540b55d7eef645741566d411b3dbed43e9b7fe2e4d099a0 rundeck-slack-incoming-webhook-plugin-0.11.jar' > /tmp/rundeck-slack-plugin.sig && \ + cd /var/lib/rundeck/libext/ && \ + shasum -a256 -c /tmp/rundeck-slack-plugin.sig && \ + cd - && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + + ADD content/ / + RUN chmod u+x /opt/run && \ + mkdir -p /var/log/supervisor && mkdir -p /opt/supervisor && \ + chmod u+x /opt/supervisor/rundeck && chmod u+x /opt/supervisor/mysql_supervisor && chmod u+x /opt/supervisor/fatalservicelistener + + EXPOSE 4440 4443 + + VOLUME ["/etc/rundeck", "/var/rundeck", "/var/lib/mysql", "/var/log/rundeck", "/opt/rundeck-plugins", "/var/lib/rundeck/logs", "/var/lib/rundeck/var/storage"] + + ENTRYPOINT ["/opt/run"] From 7122af24af5e0d757f73ad25dd25844cca5731eb Mon Sep 17 00:00:00 2001 From: NiTRoeSE Date: Thu, 30 Jan 2020 10:20:10 +0100 Subject: [PATCH 2/3] fix spacings & shasum for rundeck-cli --- Dockerfile | 106 ++++++++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/Dockerfile b/Dockerfile index 55a17da..a0c9fba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,53 +1,53 @@ - # Dockerfile for rundeck - # https://github.com/jjethwa/rundeck - - FROM debian:stretch - - MAINTAINER Jordan Jethwa - - ENV SERVER_URL=https://localhost:4443 \ - RUNDECK_STORAGE_PROVIDER=file \ - RUNDECK_PROJECT_STORAGE_TYPE=file \ - NO_LOCAL_MYSQL=false \ - LOGIN_MODULE=RDpropertyfilelogin \ - JAAS_CONF_FILE=jaas-loginmodule.conf \ - KEYSTORE_PASS=adminadmin \ - TRUSTSTORE_PASS=adminadmin \ - CLUSTER_MODE=false - - RUN export DEBIAN_FRONTEND=noninteractive && \ - echo "deb http://ftp.debian.org/debian stretch-backports main" >> /etc/apt/sources.list && \ - apt-get -qq update && \ - apt-get -qqy install -t stretch-backports --no-install-recommends bash openjdk-8-jre-headless ca-certificates-java supervisor procps sudo ca-certificates openssh-client mysql-server mysql-client postgresql-9.6 postgresql-client-9.6 pwgen curl git uuid-runtime parallel jq && \ - cd /tmp/ && \ - curl -Lo /tmp/rundeck.deb https://dl.bintray.com/rundeck/rundeck-deb/rundeck_3.2.1.20200113-1_all.deb && \ - echo '6809dbe006fc3589b711365f9a160e9331be178056471613b75d77c1f57fe49c rundeck.deb' > /tmp/rundeck.sig && \ - shasum -a256 -c /tmp/rundeck.sig && \ - curl -Lo /tmp/rundeck-cli.deb https://github.com/rundeck/rundeck-cli/releases/download/v1.1.7/rundeck-cli_1.1.7-1_all.deb && \ - echo 'ba5078167d1efb5dc89ad74eb89a2d93283b796e1286b918141c6df000683c2e rundeck-cli.deb' > /tmp/rundeck-cli.sig && \ - shasum -a256 -c /tmp/rundeck-cli.sig && \ - cd - && \ - dpkg -i /tmp/rundeck*.deb && rm /tmp/rundeck*.deb && \ - mkdir -p /tmp/rundeck && \ - chown rundeck:rundeck /tmp/rundeck && \ - mkdir -p /var/lib/rundeck/.ssh && \ - chown rundeck:rundeck /var/lib/rundeck/.ssh && \ - sed -i "s/export RDECK_JVM=\"/export RDECK_JVM=\"\${RDECK_JVM} /" /etc/rundeck/profile && \ - curl -Lo /var/lib/rundeck/libext/rundeck-slack-incoming-webhook-plugin-0.11.jar https://github.com/higanworks/rundeck-slack-incoming-webhook-plugin/releases/download/v0.11.dev/rundeck-slack-incoming-webhook-plugin-0.11.jar && \ - echo 'efce8fa7891371bb8540b55d7eef645741566d411b3dbed43e9b7fe2e4d099a0 rundeck-slack-incoming-webhook-plugin-0.11.jar' > /tmp/rundeck-slack-plugin.sig && \ - cd /var/lib/rundeck/libext/ && \ - shasum -a256 -c /tmp/rundeck-slack-plugin.sig && \ - cd - && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - - ADD content/ / - RUN chmod u+x /opt/run && \ - mkdir -p /var/log/supervisor && mkdir -p /opt/supervisor && \ - chmod u+x /opt/supervisor/rundeck && chmod u+x /opt/supervisor/mysql_supervisor && chmod u+x /opt/supervisor/fatalservicelistener - - EXPOSE 4440 4443 - - VOLUME ["/etc/rundeck", "/var/rundeck", "/var/lib/mysql", "/var/log/rundeck", "/opt/rundeck-plugins", "/var/lib/rundeck/logs", "/var/lib/rundeck/var/storage"] - - ENTRYPOINT ["/opt/run"] +# Dockerfile for rundeck +# https://github.com/jjethwa/rundeck + +FROM debian:stretch + +MAINTAINER Jordan Jethwa + +ENV SERVER_URL=https://localhost:4443 \ + RUNDECK_STORAGE_PROVIDER=file \ + RUNDECK_PROJECT_STORAGE_TYPE=file \ + NO_LOCAL_MYSQL=false \ + LOGIN_MODULE=RDpropertyfilelogin \ + JAAS_CONF_FILE=jaas-loginmodule.conf \ + KEYSTORE_PASS=adminadmin \ + TRUSTSTORE_PASS=adminadmin \ + CLUSTER_MODE=false + +RUN export DEBIAN_FRONTEND=noninteractive && \ + echo "deb http://ftp.debian.org/debian stretch-backports main" >> /etc/apt/sources.list && \ + apt-get -qq update && \ + apt-get -qqy install -t stretch-backports --no-install-recommends bash openjdk-8-jre-headless ca-certificates-java supervisor procps sudo ca-certificates openssh-client mysql-server mysql-client postgresql-9.6 postgresql-client-9.6 pwgen curl git uuid-runtime parallel jq && \ + cd /tmp/ && \ + curl -Lo /tmp/rundeck.deb https://dl.bintray.com/rundeck/rundeck-deb/rundeck_3.2.1.20200113-1_all.deb && \ + echo '6809dbe006fc3589b711365f9a160e9331be178056471613b75d77c1f57fe49c rundeck.deb' > /tmp/rundeck.sig && \ + shasum -a256 -c /tmp/rundeck.sig && \ + curl -Lo /tmp/rundeck-cli.deb https://github.com/rundeck/rundeck-cli/releases/download/v1.1.7/rundeck-cli_1.1.7-1_all.deb && \ + echo 'd8f39c3cebcf3ed16d138cbd18e014303fef27234c32d276a1cf1462f7c250da rundeck-cli.deb' > /tmp/rundeck-cli.sig && \ + shasum -a256 -c /tmp/rundeck-cli.sig && \ + cd - && \ + dpkg -i /tmp/rundeck*.deb && rm /tmp/rundeck*.deb && \ + mkdir -p /tmp/rundeck && \ + chown rundeck:rundeck /tmp/rundeck && \ + mkdir -p /var/lib/rundeck/.ssh && \ + chown rundeck:rundeck /var/lib/rundeck/.ssh && \ + sed -i "s/export RDECK_JVM=\"/export RDECK_JVM=\"\${RDECK_JVM} /" /etc/rundeck/profile && \ + curl -Lo /var/lib/rundeck/libext/rundeck-slack-incoming-webhook-plugin-0.11.jar https://github.com/higanworks/rundeck-slack-incoming-webhook-plugin/releases/download/v0.11.dev/rundeck-slack-incoming-webhook-plugin-0.11.jar && \ + echo 'efce8fa7891371bb8540b55d7eef645741566d411b3dbed43e9b7fe2e4d099a0 rundeck-slack-incoming-webhook-plugin-0.11.jar' > /tmp/rundeck-slack-plugin.sig && \ + cd /var/lib/rundeck/libext/ && \ + shasum -a256 -c /tmp/rundeck-slack-plugin.sig && \ + cd - && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + +ADD content/ / +RUN chmod u+x /opt/run && \ + mkdir -p /var/log/supervisor && mkdir -p /opt/supervisor && \ + chmod u+x /opt/supervisor/rundeck && chmod u+x /opt/supervisor/mysql_supervisor && chmod u+x /opt/supervisor/fatalservicelistener + +EXPOSE 4440 4443 + +VOLUME ["/etc/rundeck", "/var/rundeck", "/var/lib/mysql", "/var/log/rundeck", "/opt/rundeck-plugins", "/var/lib/rundeck/logs", "/var/lib/rundeck/var/storage"] + +ENTRYPOINT ["/opt/run"] From c68d1e976b4f84238a697b3a338fce4addfe266a Mon Sep 17 00:00:00 2001 From: NiTRoeSE Date: Thu, 30 Jan 2020 10:23:41 +0100 Subject: [PATCH 3/3] change rundeck-cli source back to bintray --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a0c9fba..d2c4f5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ curl -Lo /tmp/rundeck.deb https://dl.bintray.com/rundeck/rundeck-deb/rundeck_3.2.1.20200113-1_all.deb && \ echo '6809dbe006fc3589b711365f9a160e9331be178056471613b75d77c1f57fe49c rundeck.deb' > /tmp/rundeck.sig && \ shasum -a256 -c /tmp/rundeck.sig && \ - curl -Lo /tmp/rundeck-cli.deb https://github.com/rundeck/rundeck-cli/releases/download/v1.1.7/rundeck-cli_1.1.7-1_all.deb && \ + curl -Lo /tmp/rundeck-cli.deb https://dl.bintray.com/rundeck/rundeck-deb/rundeck-cli_1.1.7-1_all.deb && \ echo 'd8f39c3cebcf3ed16d138cbd18e014303fef27234c32d276a1cf1462f7c250da rundeck-cli.deb' > /tmp/rundeck-cli.sig && \ shasum -a256 -c /tmp/rundeck-cli.sig && \ cd - && \