Installing kubectl and kompose on jenkins/jdk

nxtlytics · Oct 14, 2021 · d7e956b · d7e956b
1 parent 9f5fef6
commit d7e956b
Show file tree

Hide file tree

Showing 21 changed files with 40 additions and 24 deletions.
diff --git a/apache-airflow/Dockerfile b/apache-airflow/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/python37:v0.0.8
+FROM nxtlytics/python37:v0.0.9-test00
 
 # Airflow
 ENV AIRFLOW_USER_HOME=/usr/local/airflow

diff --git a/apache-airflow/docker-compose.yml b/apache-airflow/docker-compose.yml
@@ -14,7 +14,7 @@ services:
         #   - ./pgdata:/var/lib/postgresql/data/pgdata
 
     webserver:
-        image: nxtlytics/apache-airflow:v0.0.8
+        image: nxtlytics/apache-airflow:v0.0.9-test00
         restart: always
         depends_on:
           - postgres
@@ -33,7 +33,7 @@ services:
             retries: 3
 
     flower:
-        image: nxtlytics/apache-airflow:v0.0.8
+        image: nxtlytics/apache-airflow:v0.0.9-test00
         restart: always
         depends_on:
           - redis
@@ -45,7 +45,7 @@ services:
           - "5555:5555"
 
     scheduler:
-        image: nxtlytics/apache-airflow:v0.0.8
+        image: nxtlytics/apache-airflow:v0.0.9-test00
         restart: always
         depends_on:
           - webserver
@@ -55,7 +55,7 @@ services:
           - dev.env
 
     worker:
-        image: nxtlytics/apache-airflow:v0.0.8
+        image: nxtlytics/apache-airflow:v0.0.9-test00
         restart: always
         depends_on:
           - scheduler

diff --git a/base/Dockerfile b/base/Dockerfile
@@ -4,7 +4,7 @@
 # - Base APT repos for Nexus
 # Ensure this image is built with --squash to reduce layer bloat!
 
-FROM ubuntu:focal-20210827
+FROM ubuntu:focal-20210921
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV LC_ALL=C.UTF-8

diff --git a/datadog-agent/Dockerfile b/datadog-agent/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/base:v0.0.8
+FROM nxtlytics/base:v0.0.9-test00
 
 ADD utils /opt/utils/
 RUN echo "===> Moving docker-entrypoint.sh to /usr/local/bin and making it exec" \

diff --git a/jdk/Dockerfile b/jdk/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/base:v0.0.8
+FROM nxtlytics/base:v0.0.9-test00
 
 ARG JAVA_MAJOR_VERSION=11
 ENV MAVEN_HOME=/usr/share/maven

diff --git a/jenkins/jdk/Dockerfile b/jenkins/jdk/Dockerfile
@@ -1,11 +1,13 @@
-FROM nxtlytics/jdk:v0.0.8
+FROM nxtlytics/jdk:v0.0.9-test00
 
 ENV user=jenkins
 ENV group=jenkins
 ENV uid=1000
 ENV gid=1000
 ENV AGENT_WORKDIR=/home/${user}/agent
 ENV DOCKER_VERSION=20.10.5
+ENV KUBECTL_VERSION=v1.22.0
+ENV KOMPOSE_VERSION=v1.22.0
 
 # Ensure system is up to date and install tools
 COPY jenkins-agent /usr/local/bin/jenkins-agent
@@ -51,6 +53,20 @@ RUN echo '===> Make jenkins-agent executable' && \
       -o /usr/local/bin/yq && \
     chmod +x /usr/local/bin/yq && \
     yq --version && \
+    echo '===> Installing kubectl' && \
+    #KUBECTL_VERSION="$(curl -sL https://dl.k8s.io/release/stable.txt)" && \
+    curl -sL \
+      "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" \
+      -o /usr/local/bin/kubectl && \
+    chmod +x /usr/local/bin/kubectl && \
+    kubectl --help && \
+    echo '===> Installing kompose' && \
+    #KOMPOSE_VERSION="$(curl -s 'https://api.github.com/repos/kubernetes/kompose/releases/latest' | jq -r .tag_name)" && \
+    curl -sL \
+      "https://github.com/kubernetes/kompose/releases/download/${KOMPOSE_VERSION}/kompose-linux-amd64" \
+      -o /usr/local/bin/kompose && \
+    chmod +x /usr/local/bin/kompose && \
+    kompose version && \
     echo '===> Installing docker-compose' && \
     DOCKER_COMPOSE_VERSION="$(curl -s 'https://api.github.com/repos/docker/compose/releases/latest' | jq -r .tag_name)" && \
     curl -sL \

diff --git a/jenkins/nodejs/Dockerfile b/jenkins/nodejs/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/jenkins-jdk:v0.0.8
+FROM nxtlytics/jenkins-jdk:v0.0.9-test00
 
 # Install tools
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \

diff --git a/jenkins/python37/Dockerfile b/jenkins/python37/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/jenkins-jdk:v0.0.8
+FROM nxtlytics/jenkins-jdk:v0.0.9-test00
 
 # Ensure system is up to date and install tools
 RUN echo 'deb http://archive.ubuntu.com/ubuntu/ focal-proposed restricted main multiverse universe' > /etc/apt/sources.list.d/focal-proposed.list && \

diff --git a/jenkins/python38/Dockerfile b/jenkins/python38/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/jenkins-jdk:v0.0.8
+FROM nxtlytics/jenkins-jdk:v0.0.9-test00
 
 # Ensure system is up to date and install tools
 RUN echo 'deb http://archive.ubuntu.com/ubuntu/ focal-proposed restricted main multiverse universe' > /etc/apt/sources.list.d/focal-proposed.list && \

diff --git a/jenkins/python39/Dockerfile b/jenkins/python39/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/jenkins-jdk:v0.0.8
+FROM nxtlytics/jenkins-jdk:v0.0.9-test00
 
 # Ensure system is up to date and install tools
 RUN echo 'deb http://archive.ubuntu.com/ubuntu/ focal-proposed restricted main multiverse universe' > /etc/apt/sources.list.d/focal-proposed.list && \

diff --git a/jenkins/ruby-jemalloc/Dockerfile b/jenkins/ruby-jemalloc/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/jenkins-jdk:v0.0.8
+FROM nxtlytics/jenkins-jdk:v0.0.9-test00
 
 ENV RUBY_INSTALL_VERSION=0.8.1
 ENV RUBY_VERSION=2.7.2

diff --git a/jenkins/ruby-truffle/Dockerfile b/jenkins/ruby-truffle/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/jenkins-jdk:v0.0.8
+FROM nxtlytics/jenkins-jdk:v0.0.9-test00
 
 ENV RUBY_INSTALL_VERSION=0.8.1
 ENV TRUFFLERUBY_VERSION=21.0.0

diff --git a/jenkins/ruby/Dockerfile b/jenkins/ruby/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/jenkins-jdk:v0.0.8
+FROM nxtlytics/jenkins-jdk:v0.0.9-test00
 
 ENV RUBY_INSTALL_VERSION=0.8.1
 ENV RUBY_VERSION=2.7.2

diff --git a/jupyterhub-singleuser-base/Dockerfile b/jupyterhub-singleuser-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/python38:v0.0.8
+FROM nxtlytics/python38:v0.0.9-test00
 
 COPY docker-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh \

diff --git a/nodejs/Dockerfile b/nodejs/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/base:v0.0.8
+FROM nxtlytics/base:v0.0.9-test00
 
 # Install tools
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \

diff --git a/python37/Dockerfile b/python37/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/base:v0.0.8
+FROM nxtlytics/base:v0.0.9-test00
 
 # Ensure system is up to date and install tools
 RUN echo 'deb http://archive.ubuntu.com/ubuntu/ focal-proposed restricted main multiverse universe' > /etc/apt/sources.list.d/focal-proposed.list && \

diff --git a/python38/Dockerfile b/python38/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/base:v0.0.8
+FROM nxtlytics/base:v0.0.9-test00
 
 # Ensure system is up to date and install tools
 RUN echo 'deb http://archive.ubuntu.com/ubuntu/ focal-proposed restricted main multiverse universe' > /etc/apt/sources.list.d/focal-proposed.list && \

diff --git a/python39/Dockerfile b/python39/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/base:v0.0.8
+FROM nxtlytics/base:v0.0.9-test00
 
 # Ensure system is up to date and install tools
 RUN echo 'deb http://archive.ubuntu.com/ubuntu/ focal-proposed restricted main multiverse universe' > /etc/apt/sources.list.d/focal-proposed.list && \

diff --git a/ruby-jemalloc/Dockerfile b/ruby-jemalloc/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/base:v0.0.8
+FROM nxtlytics/base:v0.0.9-test00
 
 ENV RUBY_INSTALL_VERSION=0.8.1
 ENV RUBY_VERSION=2.7.2

diff --git a/ruby-truffle/Dockerfile b/ruby-truffle/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/base:v0.0.8
+FROM nxtlytics/base:v0.0.9-test00
 
 ENV RUBY_INSTALL_VERSION=0.8.1
 ENV TRUFFLERUBY_VERSION=21.0.0

diff --git a/ruby/Dockerfile b/ruby/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/base:v0.0.8
+FROM nxtlytics/base:v0.0.9-test00
 
 ENV RUBY_INSTALL_VERSION=0.8.1
 ENV RUBY_VERSION=2.7.2