Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to Rundeck 4.17.6 #8

Merged
merged 7 commits into from
Apr 26, 2024
Merged

Upgrade to Rundeck 4.17.6 #8

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e670e6e
Upgrade to debian12 and rundeck4.17.4
chaopanubo Jan 18, 2024
7bfc5b4
Update tools version and install jdk 11
chaopanubo Jan 25, 2024
3905048
Upgrade tool.sh and checkout sidecar 1.25.3
chaopanubo Jan 30, 2024
33ff5b1
Update Rundeck version to 4.17.6, Rundeck-CLI to 2.0.8 and tools version
chaopanubo Apr 26, 2024
727815d
Fix whitespace
chaopanubo Apr 26, 2024
cf6f278
Increment year
chaopanubo Apr 26, 2024
8725ccf
Fix whitespace
chaopanubo Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 15 additions & 36 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,22 @@
FROM docker.io/debian:bullseye
FROM debian:12

# Set encoding
ENV LANG=C.UTF-8 LC_ALL=C.UTF-8

# Install base packages
RUN set -x \
&& apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y wget curl ca-certificates vim jq openssh-client uuid-runtime procps gnupg2 dirmngr db-util libpam-modules libpam0g libpam0g-dev git make lsb-release gosu skopeo \
&& apt-get install --no-install-recommends --no-install-suggests -y wget curl ca-certificates vim jq openssh-client uuid-runtime procps gnupg2 dirmngr db-util libpam-modules libpam0g libpam0g-dev git make lsb-release gosu skopeo apprise awscli \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
;

# Install JDK11
# Install JDK17 as 11 has no installation candidate
RUN set -x \
&& export DEBIAN_FRONTEND=noninteractive \
&& mkdir /etc/ssl/certs/java/ \
&& apt-get update \
&& apt-get -y install openjdk-11-jre-headless \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
;

# Install AWS CLI
ENV AWS_CLI_VERSION=1.27.96 AWS_CLI_CHECKSUM=c8085a4701a63d99f44fcc2e8eab78a5264ee0a2705f4e0193317428dd5ede55
RUN set -x \
&& apt-get update \
&& apt-get -y install python3 python3-venv unzip \
&& ln -s /usr/bin/python3 /usr/bin/python \
&& cd /tmp \
&& wget -nv https://s3.amazonaws.com/aws-cli/awscli-bundle-${AWS_CLI_VERSION}.zip -O /tmp/awscli-bundle-${AWS_CLI_VERSION}.zip \
&& echo "${AWS_CLI_CHECKSUM} awscli-bundle-${AWS_CLI_VERSION}.zip" > /tmp/SHA256SUM \
&& ( cd /tmp; sha256sum -c SHA256SUM || ( echo "Expected $(sha256sum awscli-bundle-${AWS_CLI_VERSION}.zip)"; exit 1; )) \
&& unzip awscli-bundle-${AWS_CLI_VERSION}.zip \
&& /tmp/awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws \
&& rm -rf /tmp/awscli-bundle /tmp/awscli-bundle-${AWS_CLI_VERSION}.zip \
&& apt-get -y remove unzip \
&& apt-get -y install openjdk-17-jre-headless \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
;
Expand Down Expand Up @@ -69,7 +51,7 @@ RUN set -x \
;

# Install Rundeck
ENV RUNDECK_VERSION=4.11.0.20230313-1_all RUNDECK_CHECKSUM=39b101a27dd99ce614d95cdd934ba408f6f85fc233d95c686fe013cbcbda1673
ENV RUNDECK_VERSION=4.17.4.20231216-1_all RUNDECK_CHECKSUM=fcdeec7824ff4c72e9c03db7fe4c00846101b85b15a1f8c7ff4e289f5eaf9817
RUN set -x \
&& wget --no-verbose -O /tmp/rundeck_${RUNDECK_VERSION}.deb "https://packagecloud.io/pagerduty/rundeck/packages/any/any/rundeck_${RUNDECK_VERSION}.deb/download.deb" \
&& echo "${RUNDECK_CHECKSUM} rundeck_${RUNDECK_VERSION}.deb" > /tmp/SHA256SUM \
Expand All @@ -83,7 +65,7 @@ RUN set -x \
;

# Install Rundeck CLI
ENV RUNDECK_CLI_VERSION=2.0.4-1_all RUNDECK_CLI_CHECKSUM=987a4b36870a0b0fd6a04f595ba5b179103370e5da7106cd881a8e4caec9fa11
ENV RUNDECK_CLI_VERSION=2.0.8-1_all RUNDECK_CLI_CHECKSUM=0bd1857b5f84e8ecc91212587cf5c666b2bc8a7f4299461843647f1ff7c90edb
RUN set -x \
&& wget --no-verbose -O /tmp/rundeck_${RUNDECK_CLI_VERSION}.deb "https://packagecloud.io/pagerduty/rundeck/packages/any/any/rundeck-cli_${RUNDECK_CLI_VERSION}.deb/download.deb" \
&& echo "${RUNDECK_CLI_CHECKSUM} rundeck_${RUNDECK_CLI_VERSION}.deb" > /tmp/SHA256SUM \
Expand All @@ -102,27 +84,24 @@ RUN set -x \
&& rm -rf /var/lib/apt/lists/* \
;

# Install apprise github.com/caronc/apprise
RUN set -x \
&& apt-get update \
&& apt-get install -y python3-pip \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& pip install apprise==1.3.0 \
;

# Install k8s-sidecar
RUN set -x \
&& apt-get update \
&& apt-get -y install git python3.11-venv python3 python3-pip gcc \
&& cd /tmp \
&& git clone https://github.com/kiwigrid/k8s-sidecar.git \
&& cd k8s-sidecar \
# merged fixes
&& git checkout 392b8392c4511b0ae6f8d52beb1eda77a07ec970 \
&& cd src \
&& pip install -r requirements.txt \
&& python3 -m venv .venv && .venv/bin/pip install --no-cache-dir -U pip setuptools \
&& .venv/bin/pip install --no-cache-dir -r requirements.txt \
&& rm requirements.txt \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& cp -a /tmp/k8s-sidecar/src/ /sidecar \
&& rm -rf /tmp/k8s-sidecar \
;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please pin this install to a specific release. eg git checkout 1.25.3

# && find .venv \( -type d -a -name test -o -name tests \) -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -rf '{}' \+

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unnecessary whitespace

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.


# Download plugins
COPY install-plugins.sh /
Expand Down