minor Dockerfile improvement, use minimal docker image to determine version

Author: OriHoch

Dockerfile

@@ -1,7 +1,7 @@
 FROM continuumio/miniconda3
-RUN conda update -n base -c defaults conda
-RUN apt-get update && apt-get install -y gnupg bash-completion build-essential
-RUN echo "deb http://packages.cloud.google.com/apt cloud-sdk-stretch main" >> /etc/apt/sources.list.d/google-cloud-sdk.list && \
+RUN conda update -n base -c defaults conda &&\
+    apt-get update && apt-get install -y gnupg bash-completion build-essential &&\
+    echo "deb http://packages.cloud.google.com/apt cloud-sdk-stretch main" >> /etc/apt/sources.list.d/google-cloud-sdk.list && \
     curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
     apt-get update -y && apt-get install -y google-cloud-sdk kubectl postgresql nano dnsutils
 COPY environment.yaml /environment.yaml
@@ -18,6 +18,7 @@ COPY *.sh *.py /usr/src/ckan-cloud-operator/
 RUN . /opt/conda/etc/profile.d/conda.sh && conda activate ckan-cloud-operator &&\
     cd /usr/src/ckan-cloud-operator && python3 -m pip install -e . &&\
     chmod +x /usr/src/ckan-cloud-operator/*.sh
+RUN apt-get install -y jq
 ENV EDITOR nano
 ENTRYPOINT ["/usr/src/ckan-cloud-operator/entrypoint.sh"]
 

Dockerfile.jenkins-jnlp

@@ -1,7 +1,7 @@
 FROM jenkins/jnlp-slave
 
 USER root
-RUN apt-get update && apt-get install -y gnupg bash-completion build-essential &&\
+RUN apt-get update && apt-get install -y gnupg bash-completion build-essential jq &&\
     echo "deb http://packages.cloud.google.com/apt cloud-sdk-stretch main" >> /etc/apt/sources.list.d/google-cloud-sdk.list && \
     curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
     apt-get update -y && apt-get install -y google-cloud-sdk kubectl postgresql nano dnsutils &&\

Dockerfile.minimal

@@ -0,0 +1,11 @@
+FROM python:3.7-alpine
+RUN wget -qO /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/$(wget -qO - https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl &&\
+    chmod +x /usr/local/bin/kubectl
+RUN apk --update add bash jq &&\
+    apk add --virtual build-deps gcc python-dev musl-dev &&\
+    apk add postgresql-dev
+COPY ckan_cloud_operator /usr/src/ckan-cloud-operator/ckan_cloud_operator
+COPY *.sh *.py /usr/src/ckan-cloud-operator/
+RUN python3 -m pip install psycopg2 pyyaml kubernetes click toml requests
+RUN python3 -m pip install -e /usr/src/ckan-cloud-operator
+ENTRYPOINT ["ckan-cloud-operator"]

README.md

@@ -27,21 +27,13 @@ Add an environment (sudo is required to install the executable)
 sudo ckan-cloud-operator-env add <ENVIRONMENT_NAME> <PATH_TO_KUBECONFIG_FILE>
 ```
 
-**Important** re-run the following command before starting work on the operator to ensure correct version is installed.
-Once operator is installed you can verify correct version by running `ckan-cloud-operator cluster info`
-
-Switch to the compatible operator version (may take a while on first run)
-
-```
-sudo ckan-cloud-operator-env add <ENVIRONMENT_NAME> <PATH_TO_KUBECONFIG_FILE> "$(ckan-cloud-operator config get --key ckan-cloud-operator-image --raw)"
-``` 
-
 Verify conection to the cluster and installed operator version (may take a while on first run or after upgrade of operator version)
 
 ```
 ckan-cloud-operator cluster info
 ```
 
+**Important** Re-run the add command and cluster info to verify compatible version is installed.
 
 ## Usage
 

ckan-cloud-operator-env.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-help() {
+usage() {
     echo Manage CKAN Cloud operator environments
     echo
     echo Usage: ./ckan-cloud-operator-env.sh "<COMMAND> [ARGS..]"
@@ -25,7 +25,7 @@ help() {
     echo "    Installs a ckan-cloud-operator executable at /usr/local/bin/ckan-cloud-operator configured for the ENVIRONMENT_NAME"
 }
 
-( [ "${1}" == "" ] || [ "${1}" == "-h" ] || [ "${1}" == "--help" ] ) && help && exit 1
+( [ "${1}" == "" ] || [ "${1}" == "-h" ] || [ "${1}" == "--help" ] ) && usage && exit 1
 
 if [ "${1}" == "pull" ]; then
     if [ "${2}" == "latest" ]; then
@@ -60,10 +60,10 @@ elif [ "${1}" == "add" ]; then
             IMAGE="ckan-cloud-operator"
         else
             CMD=""
-            if [ "${BUILD}" != "" ]; then
-                IMAGE="${BUILD}"
+            if [ "${BUILD}" == "" ]; then
+                IMAGE=$(docker run --entrypoint bash -v ${KUBECONFIG_FILE}:/.kube-config -e KUBECONFIG=/.kube-config viderum/ckan-cloud-operator:minimal-20190416 -c "kubectl -n ckan-cloud get configmap/operator-conf -ojsonpath={.data.ckan-cloud-operator-image}")
             else
-                IMAGE="viderum/ckan-cloud-operator:latest"
+                IMAGE="${BUILD}"
             fi
         fi
         if [ "${KUBECONFIG_FILE}" == "minikube" ]; then

entrypoint.sh

@@ -1,7 +1,11 @@
 #!/usr/bin/env bash
 
 if [ "${1}" == "bash" ]; then
-    exec bash --init-file <(echo 'source ~/.bashrc; eval "$(_CKAN_CLOUD_OPERATOR_COMPLETE=source ckan-cloud-operator)"')
+    if [ "${2}" == "" ]; then
+        exec bash --init-file <(echo 'source ~/.bashrc; eval "$(_CKAN_CLOUD_OPERATOR_COMPLETE=source ckan-cloud-operator)"')
+    else
+        exec "$@"
+    fi
 else
     source ~/.bashrc
     ckan-cloud-operator "$@"