Switching to gitpod/workspace-base

Author: devopsmariocom

.github/workflows/publish.yml

@@ -13,7 +13,8 @@ on:
 
 
 env:
-  BASE_IMAGE_VERSION: 3.15.0
+  FETCHER_IMAGE_VERSION: 3.15.0
+  BASE_IMAGE_VERSION: commit-f2d623ca9d270c2ce8560d2ca0f9ce71b105aff2 # See https://hub.docker.com/r/gitpod/workspace-base/tags
 
   # NOTE: DO NOT CHANGE THIS IS TMP IMAGE NAME
   IMAGE_NAME: image
@@ -48,7 +49,11 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Build image
-        run: docker build --build-arg BASE_IMAGE_VERSION=${BASE_IMAGE_VERSION} . --file Dockerfile --tag $IMAGE_NAME
+        run: |
+          docker build . \
+           --build-arg FETCHER_IMAGE_VERSION=${FETCHER_IMAGE_VERSION} \
+           --build-arg BASE_IMAGE_VERSION=${BASE_IMAGE_VERSION} \
+           --file Dockerfile --tag $IMAGE_NAME
 
       - name: Log into GitHub Container Registry
       # TODO: Create a PAT with `read:packages` and `write:packages` scopes and save it as an Actions secret `CR_PAT`

Dockerfile

@@ -1,13 +1,18 @@
-ARG BASE_IMAGE_VERSION
+# ARG FETCHER_IMAGE_VERSION=3.15.0
+# ARG BASE_IMAGE_VERSION=commit-f2d623ca9d270c2ce8560d2ca0f9ce71b105aff2
 
 # Based on https://github.com/gitpod-io/workspace-images/blob/master/base/Dockerfile and https://github.com/gitpod-io/workspace-images/blob/master/full/Dockerfile
 
-FROM alpine:${BASE_IMAGE_VERSION} as FETCHER
+FROM alpine:${FETCHER_IMAGE_VERSION} as FETCHER
+
+RUN apk --no-cache add unzip
 
 USER root
 
-ARG KUSTOMIZE_VERSION=v4.4.1
-ARG KUSTIMIZE_HELM_PLUGIN=v0.9.2
+ENV KUSTOMIZE_VERSION=v4.4.1
+ENV KUSTIMIZE_HELM_PLUGIN=v0.9.2
+ENV STARSHIP_VERSION=v1.1.1
+ENV DOCKER_VERSION=20.10.9
 
 RUN mkdir /tmp/completion
 
@@ -18,53 +23,55 @@ RUN kustomize completion zsh > /tmp/completion/_kustomize
 
 # Khelm https://github.com/mgoltzsche/khelm
 RUN mkdir -p /root/.config/kustomize/plugin/helm.kustomize.mgoltzsche.github.com/v1/chartrenderer && \
-    wget -O- https://github.com/mgoltzsche/helm-kustomize-plugin/releases/download/${KUSTIMIZE_HELM_PLUGIN}/helm-kustomize-plugin > /root/.config/kustomize/plugin/helm.kustomize.mgoltzsche.github.com/v1/chartrenderer/ChartRenderer && \
-    chmod u+x /root/.config/kustomize/plugin/helm.kustomize.mgoltzsche.github.com/v1/chartrenderer/ChartRenderer
+  wget -O- https://github.com/mgoltzsche/helm-kustomize-plugin/releases/download/${KUSTIMIZE_HELM_PLUGIN}/helm-kustomize-plugin > /root/.config/kustomize/plugin/helm.kustomize.mgoltzsche.github.com/v1/chartrenderer/ChartRenderer && \
+  chmod u+x /root/.config/kustomize/plugin/helm.kustomize.mgoltzsche.github.com/v1/chartrenderer/ChartRenderer
 
 # Gosu https://github.com/tianon/gosu/blob/master/hub/Dockerfile.alpine
 # TODO
 
 ADD https://raw.githubusercontent.com/perlpunk/shell-completions/6af9f7cd5db837680aef453ca6ded1a3dd219eae/zsh/_jq /tmp/completion/_jq
 
+# Starship https://github.com/starship/starship
+RUN wget -O- https://github.com/starship/starship/releases/download/${STARSHIP_VERSION}/starship-x86_64-unknown-linux-gnu.tar.gz | tar xvz -C /usr/local/bin/
+RUN chmod +x /usr/local/bin/starship
+
+# Docker https://github.com/moby/moby
+RUN wget -O- https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz | tar xvz -C /usr/local/bin/
+RUN chmod +x /usr/local/bin/docker
+
+# AWS CLI
+RUN wget https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip
+RUN unzip awscli-exe-linux-x86_64.zip -d /tmp
+RUN /tmp/aws/install --bin-dir /tmp/aws-cli-bin
 
 RUN chmod 644 /tmp/completion/*
 
-FROM alpine:${BASE_IMAGE_VERSION}
+################################################
+FROM gitpod/workspace-base:${BASE_IMAGE_VERSION}
+
+ENV RUN_AS_USER=gitpod
 
 USER root
-ARG RUN_AS_USER=gitpod
-ENV LANG=en_US.UTF-8
-
-### Packages ###
-RUN apk add --no-cache \
-  zsh \
-  git \
-  curl \
-  make \
-  jq \
-  python3 \
-  py3-pip \
-  docker \
-  starship \
-  terraform \
-  musl \
-  libc6-compat \
-  libgcc \ 
-  libstdc++
+
+## Packages ###
+RUN apt-get update && apt-get install -y \
+  python3-pip \
+  docker.io \
+  && rm -rf /var/lib/apt/lists/*
 
 ### PIP ###
 RUN pip3 install --no-cache-dir awscli
 
-### Gitpod user ###
-RUN adduser --disabled-password --shell /bin/zsh --uid 33333 ${RUN_AS_USER}
-
-ENV HOME=/home/gitpod
-WORKDIR $HOME
-
 COPY --from=FETCHER /usr/local/bin/kustomize /usr/local/bin/kustomize
 COPY --from=FETCHER /tmp/completion/_kustomize /usr/share/zsh/site-functions/_kustomize
 COPY --from=FETCHER /root/.config/kustomize/plugin/helm.kustomize.mgoltzsche.github.com/v1/chartrenderer/ChartRenderer /home/${RUN_AS_USER}/.config/kustomize/plugin/helm.kustomize.mgoltzsche.github.com/v1/chartrenderer/ChartRenderer
 COPY --from=FETCHER /tmp/completion/_jq /usr/share/zsh/site-functions/_jq
+COPY --from=FETCHER /usr/local/bin/starship /usr/local/bin/starship
+COPY --from=FETCHER /usr/local/bin/docker/docker /usr/local/bin/docker
+COPY --from=FETCHER /usr/local/aws-cli/ /usr/local/aws-cli/
+COPY --from=FETCHER /tmp/aws-cli-bin/ /usr/local/bin/
+
+RUN chsh -s /usr/bin/zsh ${RUN_AS_USER}
 
 USER gitpod