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

Upgrade to Rundeck 4.17.6 #8

Merged
merged 7 commits into from
Apr 26, 2024
Merged

Upgrade to Rundeck 4.17.6 #8

Show file tree
Hide file tree
Changes from 2 commits
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
55 changes: 15 additions & 40 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,23 @@
FROM docker.io/debian:bullseye
FROM docker.io/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
COPY install-openjdk-11.sh /
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 clean \
&& rm -rf /var/lib/apt/lists/* \
&& /install-openjdk-11.sh \
;

# Install Google Cloud SDK
RUN set -x \
&& export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" \
Expand Down Expand Up @@ -69,7 +48,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 +62,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 +81,23 @@ 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


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
19 changes: 19 additions & 0 deletions install-openjdk-11.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/usr/bin/env bash

set -e

export DEBIAN_FRONTEND=noninteractive

echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/openjdk-11.list
Copy link
Member

Choose a reason for hiding this comment

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

What is this script doing? Are we just installing the debian 11 (bullseye) packing on debian 12 (bookworm)? This is probably not safe.

Copy link
Member

Choose a reason for hiding this comment

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

diff --git a/Dockerfile b/Dockerfile
index d0600dd..793c60f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,10 +12,14 @@ RUN set -x \
   ;

 # Install JDK11
-COPY install-openjdk-11.sh /
 RUN set -x \
   && mkdir /etc/ssl/certs/java/ \
-  && /install-openjdk-11.sh \
+  && wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - \
+  && echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list \
+  && apt-get update \
+  && apt-get install --no-install-recommends --no-install-suggests -y temurin-11-jdk \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/* \
   ;

 # Install Google Cloud SDK

@macropin what do you think about using adoptium instead? I'll push this to the branch/PR if you agree.

https://adoptium.net/blog/2021/12/eclipse-temurin-linux-installers-available/


cat <<EOF > /etc/apt/preferences.d/openjdk-11
Package: openjdk-11-jdk
Pin: release n=bullseye
Pin-Priority: 1001
EOF

apt-get update
apt-get -y install openjdk-11-jdk

apt-get clean
rm -rf /var/lib/apt/lists/*
53 changes: 20 additions & 33 deletions install-tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,66 +189,53 @@ KUBECTL_1_25_8_CHECKSUM_X86_64=80e70448455f3d19c3cb49bd6ff6fc913677f4f240d368fa2
KUBECTL_1_25_8_CHECKSUM_AARCH64=28cf5f666cb0c11a8a2b3e5ae4bf93e56b74ab6051720c72bb231887bfc1a7c6
KUBECTL_1_24_12_CHECKSUM_X86_64=25875551d4242339bcc8cef0c18f0a0f631ea621f6fab1190a5aaab466634e7c
KUBECTL_1_24_12_CHECKSUM_AARCH64=a945095ceabc2b6f943c8c7c8484925b1b205738231fe7d34368a3e77dfe319b
KUBECTL_1_23_17_CHECKSUM_X86_64=f09f7338b5a677f17a9443796c648d2b80feaec9d6a094ab79a77c8a01fde941
KUBECTL_1_23_17_CHECKSUM_AARCH64=c4a48fdc6038beacbc5de3e4cf6c23639b643e76656aabe2b7798d3898ec7f05
KUBECTL_1_22_4_CHECKSUM_X86_64=21f24aa723002353eba1cc2668d0be22651f9063f444fd01626dce2b6e1c568c
KUBECTL_1_22_4_CHECKSUM_AARCH64=3fcec0284c0fdfc22e89a5b73ebd7f51120cc3505a11a4f6d6f819d46a40b26a
KUBECTL_1_21_3_CHECKSUM_X86_64=631246194fc1931cb897d61e1d542ef2321ec97adcb859a405d3b285ad9dd3d6
KUBECTL_1_21_3_CHECKSUM_AARCH64=2be58b5266faeeb93f38fa72d36add13a950643d2ae16a131f48f5a21c66ef23

HELM_3_12_3_CHECKSUM_X86_64=1b2313cd198d45eab00cc37c38f6b1ca0a948ba279c29e322bdf426d406129b5
HELM_3_12_3_CHECKSUM_AARCH64=79ef06935fb47e432c0c91bdefd140e5b543ec46376007ca14a52e5ed3023088
HELM_3_11_2_CHECKSUM_X86_64=781d826daec584f9d50a01f0f7dadfd25a3312217a14aa2fbb85107b014ac8ca
HELM_3_11_2_CHECKSUM_AARCH64=0a60baac83c3106017666864e664f52a4e16fbd578ac009f9a85456a9241c5db
HELM_3_10_3_CHECKSUM_X86_64=950439759ece902157cf915b209b8d694e6f675eaab5099fb7894f30eeaee9a2
HELM_3_10_3_CHECKSUM_AARCH64=260cda5ff2ed5d01dd0fd6e7e09bc80126e00d8bdc55f3269d05129e32f6f99d
HELM_3_9_4_CHECKSUM_X86_64=31960ff2f76a7379d9bac526ddf889fb79241191f1dbe2a24f7864ddcb3f6560
HELM_3_9_4_CHECKSUM_AARCH64=d24163e466f7884c55079d1050968e80a05b633830047116cdfd8ae28d35b0c0
HELM_3_8_2_CHECKSUM_X86_64=6cb9a48f72ab9ddfecab88d264c2f6508ab3cd42d9c09666be16a7bf006bed7b
HELM_3_8_2_CHECKSUM_AARCH64=238db7f55e887f9c1038b7e43585b84389a05fff5424e70557886cad1635b3ce
HELM_3_7_2_CHECKSUM_X86_64=4ae30e48966aba5f807a4e140dad6736ee1a392940101e4d79ffb4ee86200a9e
HELM_3_7_2_CHECKSUM_AARCH64=b0214eabbb64791f563bd222d17150ce39bf4e2f5de49f49fdb456ce9ae8162f
HELM_3_6_3_CHECKSUM_X86_64=07c100849925623dc1913209cd1a30f0a9b80a5b4d6ff2153c609d11b043e262
HELM_3_6_3_CHECKSUM_AARCH64=6fe647628bc27e7ae77d015da4d5e1c63024f673062ac7bc11453ccc55657713

SOPS_3_7_3_CHECKSUM_X86_64=53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb
SOPS_3_7_3_CHECKSUM_AARCH64=4945313ed0dfddba52a12ab460d750c91ead725d734039493da0285ad6c5f032

LEGO_4_4_0_CHECKSUM_X86_64=302a780a56dd52601aa5d1dc31e607599cb85b113830abe464001622ca8b80a2
LEGO_4_4_0_CHECKSUM_AARCH64=abe0e795be083143bc72ffe0f62670d96d1d33caeec2649b452d6fe9ac7ede4f
SOPS_3_8_1_CHECKSUM_X86_64=d6bf07fb61972127c9e0d622523124c2d81caf9f7971fb123228961021811697
SOPS_3_8_1_CHECKSUM_AARCH64=15b8e90ca80dc23125cd2925731035fdef20c749ba259df477d1dd103a06d621

YQ_4_34_1_CHECKSUM_X86_64=df8b1ea3ebd84bac31691e5b77b87c798f64c845370593e56603b9892cea3e1c
YQ_4_34_1_CHECKSUM_AARCH64=e43d788ca14c9bd949ed1c828d6073a6b42d8c78c9e454095699b1a1e844abf2
LEGO_4_14_2_CHECKSUM_X86_64=f5a978397802a2eb20771925ceb173dff88705b45fdbb2e68312269e205fa85d
LEGO_4_14_2_CHECKSUM_AARCH64=5050df1fb75085122cd253a3877e0d7ea07c4547964378a8f4753e1e2679cce6

ORAS_1_0_0_CHECKSUM_X86_64=8533c9ea1e5a0d5eb1dfc5094c0e8ef106d15462f8a119077548f88937ed2133
ORAS_1_0_0_CHECKSUM_AARCH64=332ba74c043ed590ab0fb61656e6d274243e915cb150d48be4ad64ed591dcc84
YQ_4_40_5_CHECKSUM_X86_64=bccbf5ce1717ea5cec9662446b8bfa5863747ffb0a49a32e4c8dd23ada5c26fa
YQ_4_40_5_CHECKSUM_AARCH64=e90dae67f110746a4eb7ab8bafe7362f46d1a01cb37e7db7289c30cb7a4fd13c

CRANE_0_15_2_CHECKSUM_X86_64=bd5f72ae96373ac640679a6108280b6d76698773ca21f293ae30cc17413e2ad1
CRANE_0_15_2_CHECKSUM_AARCH64=afa0bf56d95fa86fe71d5dadb5e03960b7c0586eea84270cca40b41a6d61fbb2
ORAS_1_1_0_CHECKSUM_X86_64=e09e85323b24ccc8209a1506f142e3d481e6e809018537c6b3db979c891e6ad7
ORAS_1_1_0_CHECKSUM_AARCH64=e450b081f67f6fda2f16b7046075c67c9a53f3fda92fd20ecc59873b10477ab4

CRANE_0_18_0_CHECKSUM_X86_64=cdf4d426d965d9a8ba613d7ebf3addf93101aa2e853a3f08fbfdaed2823918f3
CRANE_0_18_0_CHECKSUM_AARCH64=3e81dee96fb20f8ffaa150c1136abc39c376c7183843a5e0a6164b9623613c56

ARGO_3_1_5_CHECKSUM_X86_64=68ebb30e79aa5ab649dbd0feb6e227b0dcff2b2983c00e176cc523a9f883567b
ARGO_3_1_5_CHECKSUM_AARCH64=dc3c36081b6b49c8977dcffa9393a29e83568fba36a35f472caaac108674c03e
ARGO_3_4_5_CHECKSUM_X86_64=0528ff0c0aa87a3f150376eee2f1b26e8b41eb96578c43d715c906304627d3a1
ARGO_3_4_5_CHECKSUM_AARCH64=6d953f667ded668f351bfeb94f32e34b70badc23770c11b55e3d2bc32caa274c

install_sops 3.7.3
install_sops 3.8.1

install_lego 4.4.0
install_lego 4.14.2

install_yq 4.34.1
install_yq 4.40.5

install_oras 1.0.0
install_oras 1.1.0

install_crane 0.15.2
install_crane 0.18.0

install_helm 3.6.3
install_helm 3.7.2
install_helm 3.8.2
install_helm 3.9.4
install_helm 3.10.3
install_helm 3.11.2
Copy link
Member

Choose a reason for hiding this comment

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

Upgrade to 3.11.3

install_helm 3.12.3

Copy link
Member

Choose a reason for hiding this comment

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

Add Helm 3.13.x (what ever the latest 3.13 is)


install_kubectl 1.21.3
install_kubectl 1.22.4
install_kubectl 1.23.17
install_kubectl 1.24.12
install_kubectl 1.25.8
install_kubectl 1.26.3
Copy link
Member

Choose a reason for hiding this comment

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

Upgrade to the latest 1.24.x, 1.25.x and 1.26.x releases

Add 1.27 and 1.28 latest releases

Expand Down
Loading