From b0e54c0bf6d04a66f5892b185f58579cab99fc62 Mon Sep 17 00:00:00 2001
From: JesusPerez <jpl@jesusperez.pro>
Date: Tue, 17 Aug 2021 15:32:55 +0100
Subject: [PATCH] chore: test dockerfile, fix curl and secuence

---
 src/Dockerfile | 69 +++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/Dockerfile b/src/Dockerfile
index cc29eb8..4bab107 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -24,10 +24,13 @@ ENV AWS_ARCH=linux-amd64
 ENV UPCTL_VERSION="1.1.0"
 ENV UPCTL_ARCH="linux_x86_64"
 
+#  apt-transport-https \
+# && curl -fSL https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-${JQ_ARCH} -o /usr/local/bin/jq \
+# && chmod +x /usr/local/bin/jq \
+
 RUN apk update \
   && apk upgrade \
   && apk add --no-cache \
-  apt-transport-https \
   ca-certificates \
   bash \
   curl \
@@ -45,39 +48,37 @@ RUN apk update \
   gnupg \
   wget \
   unzip \
-  libmagic \
-  && update-ca-certificates \
-  && python3 -m ensurepip \
-  && rm -r /usr/lib/python*/ensurepip \
-  && pip3 install --upgrade pip setuptools \
-  && if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi \
-  && if [[ ! -e /usr/bin/python ]]; then ln -sf /usr/bin/python3 /usr/bin/python; fi \
-  && rm -rf /var/cache/apk/* \
-  && pip3 install jinja2 s3cmd awscli \
-  && curl -fSL https://storage.googleapis.com/kubernetes-release/release/v${K8S_VERSION}/bin/${K8S_ARCH}/kubectl -o /usr/local/bin/kubectl \
-  && chmod +x /usr/local/bin/kubectl \
-  && curl -fSL https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-${JQ_ARCH} -o /usr/local/bin/jq \
-  && chmod +x /usr/local/bin/jq \
-  && curl -fSL https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_${YQ_ARCH} -o /usr/local/bin/yq \
-  && chmod +x /usr/local/bin/yq \
-  && curl -fSl https://github.com/scaleway/scaleway-cli/releases/download/v${SCW_VERSION}/scw-${SCW_ARCH} -o /usr/local/bin/scw \
-  && chmod +x /usr/local/bin/scw \
-  && curl -fSL https://github.com/digitalocean/doctl/releases/download/v${DOCTL_VERSION}/doctl-${DOCTL_VERSION}-${DOCTL_ARCH}.tar.gz -o /usr/local/bin/doctl \
-  && chmod +x /usr/local/bin/doctl \
-  && wget -q https://github.com/restic/restic/releases/download/v${RESTIC_VERSION}/restic_${RESTIC_VERSION}_${RESTIC_ARCH}.bz2 -O /tmp/restic-${RESTIC_VERSION}.bz2 \
-  && bunzip2 /tmp/restic-${RESTIC_VERSION}.bz2 \
-  && mv /tmp/restic-${RESTIC_VERSION} /usr/local/bin/restic \
-  && chmod +x /usr/local/bin/restic \
-  && rm -f /tmp/restic* 
-  && echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list \
-  && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg  add - \
-  && apt-get update -y \
-  && apt-get install google-cloud-sdk -y \
-  && curl -fSL https://github.com/UpCloudLtd/upcloud-cli/releases/download/v${UPCTL_VERSION}/upcloud-cli_${UPCTL_VERSION}_${UPCTL_ARCH}.tar.gz -o /tmp/upctl.tar.gz \
-  && tar xvzCf /usr/local/bin /tmp/upctl.tar.gz upctl \
-  && chmod +x /usr/local/bin/upctl \
-  && rm -f /tmp/upctl.tar.gz
-
+  jq \
+  libmagic; \
+  update-ca-certificates; \
+  python3 -m ensurepip; \
+  rm -r /usr/lib/python*/ensurepip; \
+  pip3 install --upgrade pip setuptools; \
+  if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi; \
+  if [[ ! -e /usr/bin/python ]]; then ln -sf /usr/bin/python3 /usr/bin/python; fi ; \
+  rm -rf /var/cache/apk/*; \
+  pip3 install jinja2 s3cmd awscli;  \
+  curl -fSL "https://storage.googleapis.com/kubernetes-release/release/v${K8S_VERSION}/bin/${K8S_ARCH}/kubectl" -o /usr/local/bin/kubectl; \
+  chmod +x /usr/local/bin/kubectl; \
+  curl -fSL "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_${YQ_ARCH}" -o /usr/local/bin/yq; \
+  chmod +x /usr/local/bin/yq ;\
+  curl -fSl "https://github.com/scaleway/scaleway-cli/releases/download/v${SCW_VERSION}/scw-${SCW_ARCH}" -o /usr/local/bin/scw; \
+  chmod +x /usr/local/bin/scw; \
+  curl -fSL "https://github.com/digitalocean/doctl/releases/download/v${DOCTL_VERSION}/doctl-${DOCTL_VERSION}-${DOCTL_ARCH}.tar.gz" -o /usr/local/bin/doctl; \
+  chmod +x /usr/local/bin/doctl; \
+  wget -q "https://github.com/restic/restic/releases/download/v${RESTIC_VERSION}/restic_${RESTIC_VERSION}_${RESTIC_ARCH}.bz2" -O /tmp/restic-${RESTIC_VERSION}.bz2; \
+  bunzip2 /tmp/restic-${RESTIC_VERSION}.bz2; \
+  mv /tmp/restic-${RESTIC_VERSION} /usr/local/bin/restic; \
+  chmod +x /usr/local/bin/restic; \
+  rm -f /tmp/restic* ; \
+  echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list; \
+  curl -fSL "https://packages.cloud.google.com/apt/doc/apt-key.gpg"| apt-key --keyring /usr/share/keyrings/cloud.google.gpg  add - ;\
+  apt-get update -y; \
+  apt-get install google-cloud-sdk -y ; \
+  curl -fSL "https://github.com/UpCloudLtd/upcloud-cli/releases/download/v${UPCTL_VERSION}/upcloud-cli_${UPCTL_VERSION}_${UPCTL_ARCH}.tar.gz" -o /tmp/upctl.tar.gz; \
+  tar xvzCf /usr/local/bin /tmp/upctl.tar.gz upctl; \
+  chmod +x /usr/local/bin/upctl; \
+  rm -f /tmp/upctl.tar.gz
 
 # Add files
 ADD run.sh /usr/local/bin/run.sh