Skip to content

Commit be9b4eb

Browse files
Prince Rachit Sinharoboquat
authored andcommitted
[dev] Update Dockerfile
1 parent 656b666 commit be9b4eb

8 files changed

+16
-22
lines changed

.gitpod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
1+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-update-dep.2
22
workspaceLocation: gitpod/gitpod-ws.code-workspace
33
checkoutLocation: gitpod
44
ports:

.werft/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pod:
6868
- name: MYSQL_TCP_PORT
6969
value: 23306
7070
- name: build
71-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
71+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-update-dep.2
7272
workingDir: /workspace
7373
imagePullPolicy: Always
7474
volumeMounts:

.werft/debug.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pod:
5353
- name: MYSQL_TCP_PORT
5454
value: 23306
5555
- name: build
56-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
56+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-update-dep.2
5757
workingDir: /workspace
5858
imagePullPolicy: Always
5959
volumeMounts:

.werft/platform-clean-up-werft-build-nodes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pod:
1616
type: Directory
1717
containers:
1818
- name: build
19-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
19+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-update-dep.2
2020
workingDir: /workspace
2121
imagePullPolicy: IfNotPresent
2222
env:

.werft/platform-delete-preview-environments-cron.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pod:
1818
secretName: gcp-sa-gitpod-release-deployer
1919
containers:
2020
- name: build
21-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
21+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-update-dep.2
2222
workingDir: /workspace
2323
imagePullPolicy: Always
2424
volumeMounts:

.werft/run-integration-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pod:
2222
emptyDir: {}
2323
initContainers:
2424
- name: gcloud
25-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
25+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-update-dep.2
2626
workingDir: /workspace
2727
imagePullPolicy: Always
2828
volumeMounts:

.werft/wipe-devstaging.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pod:
1414
secretName: gcp-sa-gitpod-dev-deployer
1515
containers:
1616
- name: wipe-devstaging
17-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
17+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-update-dep.2
1818
workingDir: /workspace
1919
imagePullPolicy: Always
2020
volumeMounts:

dev/image/Dockerfile

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
# Licensed under the GNU Affero General Public License (AGPL).
33
# See License-AGPL.txt in the project root for license information.
44

5-
# if you want to run this image in a workspace, follow these steps:
6-
# gcloud auth configure-docker europe-docker.pkg.dev
7-
# gcloud auth login --no-launch-browser
8-
FROM europe-docker.pkg.dev/gitpod-artifacts/docker-dev/workspace-full-vnc:2022-01-28-04-35-05
5+
FROM gitpod/workspace-full-vnc:latest
96

107
ENV TRIGGER_REBUILD 16
118

@@ -18,7 +15,7 @@ RUN curl -fsSL https://dl.google.com/cloudsql/cloud_sql_proxy.linux.amd64 > $CLO
1815

1916
### Helm3 ###
2017
RUN mkdir -p /tmp/helm/ \
21-
&& curl -fsSL https://get.helm.sh/helm-v3.7.1-linux-amd64.tar.gz | tar -xzvC /tmp/helm/ --strip-components=1 \
18+
&& curl -fsSL https://get.helm.sh/helm-v3.8.1-linux-amd64.tar.gz | tar -xzvC /tmp/helm/ --strip-components=1 \
2219
&& cp /tmp/helm/helm /usr/local/bin/helm \
2320
&& ln -s /usr/local/bin/helm /usr/local/bin/helm3 \
2421
&& rm -rf /tmp/helm/ \
@@ -51,23 +48,20 @@ RUN curl -fsSL https://github.com/kubernetes-sigs/kubebuilder/releases/download/
5148
### MySQL client ###
5249
RUN install-packages mysql-client
5350

54-
# golangci-lint
55-
RUN cd /usr/local && curl -fsSL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.42.0
56-
5751
# gokart
58-
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
52+
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
5953

6054
# leeway
6155
ENV LEEWAY_MAX_PROVENANCE_BUNDLE_SIZE=8388608
6256
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
6357

6458
# dazzle
65-
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
59+
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
6660

6761
# werft CLI
6862
ENV WERFT_K8S_NAMESPACE=werft
6963
ENV WERFT_DIAL_MODE=kubernetes
70-
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
64+
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
7165

7266
# yq - jq for YAML files
7367
# 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/
7973
### Protobuf
8074
RUN set -ex \
8175
&& tmpdir=$(mktemp -d) \
82-
&& curl -fsSL -o $tmpdir/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v3.19.1/protoc-3.19.1-linux-x86_64.zip \
76+
&& curl -fsSL -o $tmpdir/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip \
8377
&& mkdir -p /usr/lib/protoc && cd /usr/lib/protoc && unzip $tmpdir/protoc.zip \
8478
&& chmod -R o+r+x /usr/lib/protoc/include \
8579
&& chmod -R +x /usr/lib/protoc/bin \
@@ -99,7 +93,7 @@ RUN curl -fsSL https://packagecloud.io/datawireio/telepresence/gpgkey | apt-key
9993
telepresence=0.109
10094

10195
### Toxiproxy CLI
102-
RUN curl -fsSL -o /usr/bin/toxiproxy https://github.com/Shopify/toxiproxy/releases/download/v2.1.4/toxiproxy-cli-linux-amd64 \
96+
RUN curl -fsSL -o /usr/bin/toxiproxy https://github.com/Shopify/toxiproxy/releases/download/v2.4.0/toxiproxy-cli-linux-amd64 \
10397
&& chmod +x /usr/bin/toxiproxy
10498

10599
### libseccomp > 2.5.2
@@ -144,7 +138,7 @@ ARG GCS_DIR=/opt/google-cloud-sdk
144138
ENV PATH=$GCS_DIR/bin:$PATH
145139
RUN sudo chown gitpod: /opt \
146140
&& mkdir $GCS_DIR \
147-
&& curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-354.0.0-linux-x86_64.tar.gz \
141+
&& curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-376.0.0-linux-x86_64.tar.gz \
148142
| tar -xzvC /opt \
149143
&& /opt/google-cloud-sdk/install.sh --quiet --usage-reporting=false --bash-completion=true \
150144
--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
187181
&& sudo chown -R gitpod:gitpod $HOME/.aws-iam
188182

189183
# Install Terraform
190-
ARG RELEASE_URL="https://releases.hashicorp.com/terraform/0.15.4/terraform_0.15.4_linux_amd64.zip"
184+
ARG RELEASE_URL="https://releases.hashicorp.com/terraform/1.1.7/terraform_1.1.7_linux_amd64.zip"
191185
RUN mkdir -p ~/.terraform \
192186
&& cd ~/.terraform \
193187
&& curl -fsSL -o terraform_linux_amd64.zip ${RELEASE_URL} \

0 commit comments

Comments
 (0)