[dev] Update Dockerfile

gitpod-io · Mar 17, 2022 · be9b4eb · be9b4eb
1 parent 656b666
commit be9b4eb
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 22 deletions.
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -1,4 +1,4 @@
-image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
+image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-update-dep.2
 workspaceLocation: gitpod/gitpod-ws.code-workspace
 checkoutLocation: gitpod
 ports:

diff --git a/.werft/build.yaml b/.werft/build.yaml
@@ -68,7 +68,7 @@ pod:
     - name: MYSQL_TCP_PORT
       value: 23306
   - name: build
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-update-dep.2
     workingDir: /workspace
     imagePullPolicy: Always
     volumeMounts:

diff --git a/.werft/debug.yaml b/.werft/debug.yaml
@@ -53,7 +53,7 @@ pod:
     - name: MYSQL_TCP_PORT
       value: 23306
   - name: build
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-update-dep.2
     workingDir: /workspace
     imagePullPolicy: Always
     volumeMounts:

diff --git a/.werft/platform-clean-up-werft-build-nodes.yaml b/.werft/platform-clean-up-werft-build-nodes.yaml
@@ -16,7 +16,7 @@ pod:
         type: Directory
   containers:
     - name: build
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-update-dep.2
       workingDir: /workspace
       imagePullPolicy: IfNotPresent
       env:

diff --git a/.werft/platform-delete-preview-environments-cron.yaml b/.werft/platform-delete-preview-environments-cron.yaml
@@ -18,7 +18,7 @@ pod:
       secretName: gcp-sa-gitpod-release-deployer
   containers:
   - name: build
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-update-dep.2
     workingDir: /workspace
     imagePullPolicy: Always
     volumeMounts:

diff --git a/.werft/run-integration-tests.yaml b/.werft/run-integration-tests.yaml
@@ -22,7 +22,7 @@ pod:
     emptyDir: {}
   initContainers:
   - name: gcloud
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-update-dep.2
     workingDir: /workspace
     imagePullPolicy: Always
     volumeMounts:

diff --git a/.werft/wipe-devstaging.yaml b/.werft/wipe-devstaging.yaml
@@ -14,7 +14,7 @@ pod:
       secretName: gcp-sa-gitpod-dev-deployer
   containers:
   - name: wipe-devstaging
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-update-dep.2
     workingDir: /workspace
     imagePullPolicy: Always
     volumeMounts:

diff --git a/dev/image/Dockerfile b/dev/image/Dockerfile
@@ -2,10 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-# if you want to run this image in a workspace, follow these steps:
-# gcloud auth configure-docker europe-docker.pkg.dev
-# gcloud auth login --no-launch-browser
-FROM europe-docker.pkg.dev/gitpod-artifacts/docker-dev/workspace-full-vnc:2022-01-28-04-35-05
+FROM gitpod/workspace-full-vnc:latest
 
 ENV TRIGGER_REBUILD 16
 
@@ -18,7 +15,7 @@ RUN curl -fsSL https://dl.google.com/cloudsql/cloud_sql_proxy.linux.amd64 > $CLO
 
 ### Helm3 ###
 RUN mkdir -p /tmp/helm/ \
-    && curl -fsSL https://get.helm.sh/helm-v3.7.1-linux-amd64.tar.gz | tar -xzvC /tmp/helm/ --strip-components=1 \
+    && curl -fsSL https://get.helm.sh/helm-v3.8.1-linux-amd64.tar.gz | tar -xzvC /tmp/helm/ --strip-components=1 \
     && cp /tmp/helm/helm /usr/local/bin/helm \
     && ln -s /usr/local/bin/helm /usr/local/bin/helm3 \
     && rm -rf /tmp/helm/ \
@@ -51,23 +48,20 @@ RUN curl -fsSL https://github.com/kubernetes-sigs/kubebuilder/releases/download/
 ### MySQL client ###
 RUN install-packages mysql-client
 
-# golangci-lint
-RUN cd /usr/local && curl -fsSL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.42.0
-
 # gokart
-RUN cd /usr/bin && curl -L https://github.com/praetorian-inc/gokart/releases/download/v0.3.0/gokart_0.3.0_linux_x86_64.tar.gz | tar xzv gokart
+RUN cd /usr/bin && curl -L https://github.com/praetorian-inc/gokart/releases/download/v0.4.0/gokart_0.4.0_linux_x86_64.tar.gz | tar xzv gokart
 
 # leeway
 ENV LEEWAY_MAX_PROVENANCE_BUNDLE_SIZE=8388608
 RUN cd /usr/bin && curl -fsSL https://github.com/gitpod-io/leeway/releases/download/v0.2.17/leeway_0.2.17_Linux_x86_64.tar.gz | tar xz
 
 # dazzle
-RUN cd /usr/bin && curl -fsSL https://github.com/gitpod-io/dazzle/releases/download/v0.1.4/dazzle_0.1.4_Darwin_x86_64.tar.gz| tar xz
+RUN cd /usr/bin && curl -fsSL https://github.com/gitpod-io/dazzle/releases/download/v0.1.7/dazzle_0.1.7_Darwin_x86_64.tar.gz| tar xz
 
 # werft CLI
 ENV WERFT_K8S_NAMESPACE=werft
 ENV WERFT_DIAL_MODE=kubernetes
-RUN cd /usr/bin && curl -fsSL https://github.com/csweichel/werft/releases/download/v0.1.4/werft-client-linux-amd64.tar.gz | tar xz && mv werft-client-linux-amd64 werft
+RUN cd /usr/bin && curl -fsSL https://github.com/csweichel/werft/releases/download/v0.2.2/werft-client-linux-amd64.tar.gz | tar xz && mv werft-client-linux-amd64 werft
 
 # yq - jq for YAML files
 # Note: we rely on version 3.x.x in various places, 4.x breaks this!
@@ -79,7 +73,7 @@ RUN cd /usr/bin && curl -fsSL https://github.com/c4milo/github-release/releases/
 ### Protobuf
 RUN set -ex \
     && tmpdir=$(mktemp -d) \
-    && curl -fsSL -o $tmpdir/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v3.19.1/protoc-3.19.1-linux-x86_64.zip \
+    && curl -fsSL -o $tmpdir/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip \
     && mkdir -p /usr/lib/protoc && cd /usr/lib/protoc && unzip $tmpdir/protoc.zip \
     && chmod -R o+r+x /usr/lib/protoc/include \
     && chmod -R +x /usr/lib/protoc/bin \
@@ -99,7 +93,7 @@ RUN curl -fsSL https://packagecloud.io/datawireio/telepresence/gpgkey | apt-key
     telepresence=0.109
 
 ### Toxiproxy CLI
-RUN curl -fsSL -o /usr/bin/toxiproxy https://github.com/Shopify/toxiproxy/releases/download/v2.1.4/toxiproxy-cli-linux-amd64 \
+RUN curl -fsSL -o /usr/bin/toxiproxy https://github.com/Shopify/toxiproxy/releases/download/v2.4.0/toxiproxy-cli-linux-amd64 \
     && chmod +x /usr/bin/toxiproxy
 
 ### libseccomp > 2.5.2
@@ -144,7 +138,7 @@ ARG GCS_DIR=/opt/google-cloud-sdk
 ENV PATH=$GCS_DIR/bin:$PATH
 RUN sudo chown gitpod: /opt \
     && mkdir $GCS_DIR \
-    && curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-354.0.0-linux-x86_64.tar.gz \
+    && curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-376.0.0-linux-x86_64.tar.gz \
     | tar -xzvC /opt \
     && /opt/google-cloud-sdk/install.sh --quiet --usage-reporting=false --bash-completion=true \
     --additional-components docker-credential-gcr alpha beta \
@@ -187,7 +181,7 @@ RUN sudo curl -fsSL -o aws-iam-authenticator "https://amazon-eks.s3.us-west-2.am
     && sudo chown -R gitpod:gitpod $HOME/.aws-iam
 
 # Install Terraform
-ARG RELEASE_URL="https://releases.hashicorp.com/terraform/0.15.4/terraform_0.15.4_linux_amd64.zip"
+ARG RELEASE_URL="https://releases.hashicorp.com/terraform/1.1.7/terraform_1.1.7_linux_amd64.zip"
 RUN mkdir -p ~/.terraform \
     && cd ~/.terraform \
     && curl -fsSL -o terraform_linux_amd64.zip ${RELEASE_URL} \