Skip to content

Update gitpod dev image #10529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/code-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Download leeway
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 | sudo tar xz
- name: Download golangci-lint
run: cd /usr/local && curl -fsSL https://github.com/raw/golangci/golangci-lint/master/install.sh | sh -s v1.45.2
run: cd /usr/local && curl -fsSL https://github.com/raw/golangci/golangci-lint/master/install.sh | sh -s v1.46.2
- name: Download GoKart
run: cd /usr/local/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
- name: Auth Google Cloud SDK
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jetbrains-auto-update-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Download leeway
run: cd /usr/local/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
- name: Download golangci-lint
run: cd /usr/local && curl -fsSL https://github.com/raw/golangci/golangci-lint/master/install.sh | sh -s v1.45.2
run: cd /usr/local && curl -fsSL https://github.com/raw/golangci/golangci-lint/master/install.sh | sh -s v1.46.2
- name: Download GoKart
run: cd /usr/local/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
- name: Auth Google Cloud SDK
Expand Down
2 changes: 1 addition & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:me-me-image.1
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go183.2.1
workspaceLocation: gitpod/gitpod-ws.code-workspace
checkoutLocation: gitpod
ports:
Expand Down
2 changes: 1 addition & 1 deletion .werft/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ pod:
- name: MYSQL_TCP_PORT
value: 23306
- name: build
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:me-me-image.1
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go183.2.1
workingDir: /workspace
imagePullPolicy: IfNotPresent
resources:
Expand Down
2 changes: 1 addition & 1 deletion .werft/debug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ pod:
- name: MYSQL_TCP_PORT
value: 23306
- name: build
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:me-me-image.1
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go183.2.1
workingDir: /workspace
imagePullPolicy: IfNotPresent
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion .werft/gke-installer-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pod:
secretName: sh-playground-dns-perm
containers:
- name: nightly-test
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:cw-werft-cred.0
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go183.2.1
workingDir: /workspace
imagePullPolicy: Always
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion .werft/ide-integration-tests-startup-jetbrains.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pod:
emptyDir: {}
containers:
- name: gcloud
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:me-me-image.1
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go183.2.1
workingDir: /workspace
imagePullPolicy: IfNotPresent
env:
Expand Down
2 changes: 1 addition & 1 deletion .werft/ide-integration-tests-startup-vscode.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pod:
emptyDir: {}
containers:
- name: gcloud
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:me-me-image.1
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go183.2.1
workingDir: /workspace
imagePullPolicy: IfNotPresent
env:
Expand Down
2 changes: 1 addition & 1 deletion .werft/ide-run-integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pod:
emptyDir: {}
initContainers:
- name: gcloud
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:me-me-image.1
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go183.2.1
workingDir: /workspace
imagePullPolicy: IfNotPresent
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion .werft/platform-delete-preview-environments-cron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pod:
secretName: harvester-vm-ssh-keys
containers:
- name: build
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:me-me-image.1
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go183.2.1
workingDir: /workspace
imagePullPolicy: IfNotPresent
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion .werft/platform-trigger-werft-cleanup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pod:
secretName: gcp-sa-gitpod-dev-deployer
containers:
- name: build
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:me-me-image.1
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go183.2.1
workingDir: /workspace
imagePullPolicy: IfNotPresent
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion .werft/run-integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pod:
emptyDir: {}
initContainers:
- name: gcloud
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:me-me-image.1
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go183.2.1
workingDir: /workspace
imagePullPolicy: IfNotPresent
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion .werft/wipe-devstaging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:me-me-image.1
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go183.2.1
workingDir: /workspace
imagePullPolicy: IfNotPresent
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion .werft/workspace-run-integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pod:
emptyDir: {}
containers:
- name: gcloud
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:me-me-image.1
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go183.2.1
workingDir: /workspace
imagePullPolicy: IfNotPresent
env:
Expand Down
26 changes: 13 additions & 13 deletions dev/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

FROM gitpod/workspace-full:latest

ENV TRIGGER_REBUILD 18
ENV TRIGGER_REBUILD 19

USER root

Expand All @@ -23,7 +23,7 @@ RUN mkdir -p /tmp/helm/ \

### kubernetes ###
RUN mkdir -p /usr/local/kubernetes/ && \
curl -fsSL https://github.com/kubernetes/kubernetes/releases/download/v1.23.6/kubernetes.tar.gz \
curl -fsSL https://github.com/kubernetes/kubernetes/releases/download/v1.24.1/kubernetes.tar.gz \
| tar -xzvC /usr/local/kubernetes/ --strip-components=1 \
&& KUBERNETES_SKIP_CONFIRM=true /usr/local/kubernetes/cluster/get-kube-binaries.sh \
&& chown gitpod:gitpod -R /usr/local/kubernetes
Expand All @@ -34,7 +34,7 @@ ENV PATH=$PATH:/usr/local/kubernetes/cluster/:/usr/local/kubernetes/client/bin/
RUN curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \
# really 'xenial'
&& add-apt-repository -yu "deb https://apt.kubernetes.io/ kubernetes-xenial main" \
&& install-packages kubectl=1.23.5-00 \
&& install-packages kubectl=1.24.1-00 \
&& kubectl completion bash > /usr/share/bash-completion/completions/kubectl

RUN curl -fsSL -o /usr/bin/kubectx https://github.com/raw/ahmetb/kubectx/master/kubectx && chmod +x /usr/bin/kubectx \
Expand All @@ -51,17 +51,17 @@ RUN curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/focal.gpg | sudo apt-key
RUN install-packages mysql-client

### CertManager's cmctl
RUN cd /usr/bin && curl -L cmctl.tar.gz https://github.com/cert-manager/cert-manager/releases/download/v1.7.2/cmctl-linux-amd64.tar.gz | tar xzv cmctl
RUN cd /usr/bin && curl -fsSL https://github.com/cert-manager/cert-manager/releases/download/v1.8.0/cmctl-linux-amd64.tar.gz | tar xzv --no-anchored cmctl

# 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
RUN cd /usr/bin && curl -fsSL https://github.com/praetorian-inc/gokart/releases/download/v0.4.0/gokart_0.4.0_linux_x86_64.tar.gz | tar xzv --no-anchored 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.11/dazzle_0.1.11_Linux_x86_64.tar.gz| tar xz
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

# werft CLI
ENV WERFT_K8S_NAMESPACE=werft
Expand All @@ -80,7 +80,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.20.0/protoc-3.20.0-linux-x86_64.zip \
&& curl -fsSL -o $tmpdir/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v3.20.1/protoc-3.20.1-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 \
Expand Down Expand Up @@ -145,7 +145,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-376.0.0-linux-x86_64.tar.gz \
&& curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-388.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 \
Expand Down Expand Up @@ -211,28 +211,28 @@ RUN sudo install-packages shellcheck \
&& sudo python3 -m pip install pre-commit

# gh (Github CLI) binary:
RUN cd /usr/bin && curl -L https://github.com/cli/cli/releases/download/v2.11.3/gh_2.11.3_linux_amd64.tar.gz \
RUN cd /usr/bin && curl -fsSL https://github.com/cli/cli/releases/download/v2.11.3/gh_2.11.3_linux_amd64.tar.gz \
| sudo tar xzv --strip-components=2 gh_2.11.3_linux_amd64/bin/gh

# Install observability-related binaries
ARG PROM_VERSION="2.30.0"
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/

ARG JSONNET_BUNDLER_VERSION="0.4.0"
RUN curl -L -o jb https://github.com/jsonnet-bundler/jsonnet-bundler/releases/download/v${JSONNET_BUNDLER_VERSION}/jb-linux-amd64 && \
RUN curl -fsSL -o jb https://github.com/jsonnet-bundler/jsonnet-bundler/releases/download/v${JSONNET_BUNDLER_VERSION}/jb-linux-amd64 && \
chmod +x jb && sudo mv jb /usr/local/bin

ARG JSONNET_VERSION="0.17.0"
RUN curl -LO https://github.com/google/go-jsonnet/releases/download/v${JSONNET_VERSION}/go-jsonnet_${JSONNET_VERSION}_Linux_x86_64.tar.gz && \
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

ARG GOJSONTOYAML_VERSION="0.1.0"
RUN curl -LO https://github.com/brancz/gojsontoyaml/releases/download/v${GOJSONTOYAML_VERSION}/gojsontoyaml_${GOJSONTOYAML_VERSION}_linux_amd64.tar.gz && \
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

Expand Down