diff --git a/.gitpod.yml b/.gitpod.yml index e7d39bb2c26b71..8ca21f1eac5397 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,4 @@ -image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go184.0 +image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-install-evans-in-base-image.1 workspaceLocation: gitpod/gitpod-ws.code-workspace checkoutLocation: gitpod ports: diff --git a/.werft/aks-installer-tests.yaml b/.werft/aks-installer-tests.yaml index 1cb04e4a4448fc..77a05a5fec70d7 100644 --- a/.werft/aks-installer-tests.yaml +++ b/.werft/aks-installer-tests.yaml @@ -21,7 +21,7 @@ pod: secretName: sh-playground-dns-perm containers: - name: nightly-test - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go184.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-install-evans-in-base-image.1 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/build.yaml b/.werft/build.yaml index f3646f54c48288..ab06b38ede2a54 100644 --- a/.werft/build.yaml +++ b/.werft/build.yaml @@ -75,7 +75,7 @@ pod: - name: MYSQL_TCP_PORT value: 23306 - name: build - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go184.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-install-evans-in-base-image.1 workingDir: /workspace imagePullPolicy: IfNotPresent resources: diff --git a/.werft/debug.yaml b/.werft/debug.yaml index 0a0c508957ea9f..e44abcadf35a7a 100644 --- 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:aledbf-go184.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-install-evans-in-base-image.1 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/eks-installer-tests.yaml b/.werft/eks-installer-tests.yaml index f9c2cfc6d1fecb..8f8814c5364126 100644 --- a/.werft/eks-installer-tests.yaml +++ b/.werft/eks-installer-tests.yaml @@ -21,7 +21,7 @@ pod: secretName: sh-playground-dns-perm containers: - name: nightly-test - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go184.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-install-evans-in-base-image.1 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/gke-installer-tests.yaml b/.werft/gke-installer-tests.yaml index 66dbc4646d9b02..a7499b8c82dc3e 100644 --- a/.werft/gke-installer-tests.yaml +++ b/.werft/gke-installer-tests.yaml @@ -21,7 +21,7 @@ pod: secretName: sh-playground-dns-perm containers: - name: nightly-test - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go184.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-install-evans-in-base-image.1 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/ide-integration-tests-startup-jetbrains.yaml b/.werft/ide-integration-tests-startup-jetbrains.yaml index 40e26edbd6ccd0..37267cc1635f67 100644 --- a/.werft/ide-integration-tests-startup-jetbrains.yaml +++ b/.werft/ide-integration-tests-startup-jetbrains.yaml @@ -16,7 +16,7 @@ pod: secretName: github-token-gitpod-bot containers: - name: gcloud - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go184.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-install-evans-in-base-image.1 workingDir: /workspace imagePullPolicy: IfNotPresent env: diff --git a/.werft/ide-integration-tests-startup-vscode.yaml b/.werft/ide-integration-tests-startup-vscode.yaml index 90fc36df6c209b..d2495cd1da7244 100644 --- a/.werft/ide-integration-tests-startup-vscode.yaml +++ b/.werft/ide-integration-tests-startup-vscode.yaml @@ -16,7 +16,7 @@ pod: secretName: github-token-gitpod-bot containers: - name: gcloud - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go184.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-install-evans-in-base-image.1 workingDir: /workspace imagePullPolicy: IfNotPresent env: diff --git a/.werft/ide-run-integration-tests.yaml b/.werft/ide-run-integration-tests.yaml index 4e08da289f2b44..d78a5c18d453c6 100644 --- a/.werft/ide-run-integration-tests.yaml +++ b/.werft/ide-run-integration-tests.yaml @@ -25,7 +25,7 @@ pod: emptyDir: {} initContainers: - name: gcloud - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go184.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-install-evans-in-base-image.1 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/k3s-installer-tests.yaml b/.werft/k3s-installer-tests.yaml index 466063031043d8..a30a8cddd98962 100644 --- a/.werft/k3s-installer-tests.yaml +++ b/.werft/k3s-installer-tests.yaml @@ -21,7 +21,7 @@ pod: secretName: sh-playground-dns-perm containers: - name: nightly-test - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go184.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-install-evans-in-base-image.1 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/platform-delete-preview-environments-cron.yaml b/.werft/platform-delete-preview-environments-cron.yaml index 5d45a29ec5df6a..3abd1d1258e298 100644 --- a/.werft/platform-delete-preview-environments-cron.yaml +++ b/.werft/platform-delete-preview-environments-cron.yaml @@ -24,7 +24,7 @@ pod: secretName: harvester-vm-ssh-keys containers: - name: build - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go184.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-install-evans-in-base-image.1 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/platform-trigger-werft-cleanup.yaml b/.werft/platform-trigger-werft-cleanup.yaml index 9b884f8e0d16f6..a576201786af68 100644 --- a/.werft/platform-trigger-werft-cleanup.yaml +++ b/.werft/platform-trigger-werft-cleanup.yaml @@ -21,7 +21,7 @@ pod: secretName: gcp-sa-gitpod-dev-deployer containers: - name: build - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go184.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-install-evans-in-base-image.1 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/run-integration-tests.yaml b/.werft/run-integration-tests.yaml index 43b9c680f34421..91a065344b9852 100644 --- 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:aledbf-go184.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-install-evans-in-base-image.1 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/self-hosted-installer-tests.yaml b/.werft/self-hosted-installer-tests.yaml index 6144d19a3ddbf3..f8060d4297484d 100644 --- a/.werft/self-hosted-installer-tests.yaml +++ b/.werft/self-hosted-installer-tests.yaml @@ -52,7 +52,7 @@ pod: secretName: aks-credentials containers: - name: nightly-test - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go184.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-install-evans-in-base-image.1 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/wipe-devstaging.yaml b/.werft/wipe-devstaging.yaml index 58dbe7a6a4f305..09f3b4ba2b5317 100644 --- 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:aledbf-go184.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-install-evans-in-base-image.1 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/workspace-run-integration-tests.yaml b/.werft/workspace-run-integration-tests.yaml index 0a088d93dbdd32..498b77ca1e9b94 100644 --- a/.werft/workspace-run-integration-tests.yaml +++ b/.werft/workspace-run-integration-tests.yaml @@ -16,7 +16,7 @@ pod: secretName: github-token-gitpod-bot containers: - name: gcloud - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go184.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-install-evans-in-base-image.1 workingDir: /workspace imagePullPolicy: IfNotPresent env: diff --git a/dev/image/Dockerfile b/dev/image/Dockerfile index 6decf17f6df802..877a105ae801a9 100644 --- a/dev/image/Dockerfile +++ b/dev/image/Dockerfile @@ -60,6 +60,9 @@ RUN cd /usr/bin && curl -fsSL https://github.com/praetorian-inc/gokart/releases/ 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 +# evans (gRPC client) +RUN cd /usr/bin && curl -fsSL https://github.com/ktr0731/evans/releases/download/v0.10.6/evans_linux_amd64.tar.gz | tar xz evans + # dazzle RUN cd /usr/bin && curl -fsSL https://github.com/gitpod-io/dazzle/releases/download/v0.1.11/dazzle_0.1.11_Linux_x86_64.tar.gz | tar xz @@ -222,7 +225,8 @@ ARG PROM_VERSION="2.36.0" RUN curl -LO https://github.com/prometheus/prometheus/releases/download/v${PROM_VERSION}/prometheus-${PROM_VERSION}.linux-amd64.tar.gz && \ tar -xzvf prometheus-${PROM_VERSION}.linux-amd64.tar.gz && \ sudo mv prometheus-${PROM_VERSION}.linux-amd64/promtool /usr/local/bin/promtool && \ - rm -rf prometheus-${PROM_VERSION}.linux-amd64/ + rm -rf prometheus-${PROM_VERSION}.linux-amd64/ && \ + rm -f prometheus-${PROM_VERSION}.linux-amd64.tar.gz ARG JSONNET_BUNDLER_VERSION="0.4.0" RUN curl -fsSL -o jb https://github.com/jsonnet-bundler/jsonnet-bundler/releases/download/v${JSONNET_BUNDLER_VERSION}/jb-linux-amd64 && \ @@ -232,12 +236,16 @@ ARG JSONNET_VERSION="0.17.0" RUN curl -fsSLO https://github.com/google/go-jsonnet/releases/download/v${JSONNET_VERSION}/go-jsonnet_${JSONNET_VERSION}_Linux_x86_64.tar.gz && \ tar -xzvf go-jsonnet_${JSONNET_VERSION}_Linux_x86_64.tar.gz && \ sudo mv jsonnet /usr/local/bin/jsonnet && \ - sudo mv jsonnetfmt /usr/local/bin/jsonnetfmt + sudo mv jsonnetfmt /usr/local/bin/jsonnetfmt && \ + tar -tzf go-jsonnet_${JSONNET_VERSION}_Linux_x86_64.tar.gz | xargs rm -f && \ + rm -f go-jsonnet_${JSONNET_VERSION}_Linux_x86_64.tar.gz ARG GOJSONTOYAML_VERSION="0.1.0" RUN curl -fsSLO https://github.com/brancz/gojsontoyaml/releases/download/v${GOJSONTOYAML_VERSION}/gojsontoyaml_${GOJSONTOYAML_VERSION}_linux_amd64.tar.gz && \ tar -xzvf gojsontoyaml_${GOJSONTOYAML_VERSION}_linux_amd64.tar.gz && \ - sudo mv gojsontoyaml /usr/local/bin/gojsontoyaml + sudo mv gojsontoyaml /usr/local/bin/gojsontoyaml && \ + tar -tzf gojsontoyaml_${GOJSONTOYAML_VERSION}_linux_amd64.tar.gz | xargs rm -f && \ + rm -f gojsontoyaml_${GOJSONTOYAML_VERSION}_linux_amd64.tar.gz # Install Replicated and KOTS RUN curl https://raw.githubusercontent.com/replicatedhq/replicated/v0.38.0/install.sh | sudo bash && \