Skip to content

Commit

Permalink
Add Replicated/KOTS dependencies to workspace image
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Emms committed Mar 2, 2022
1 parent baee93a commit 1ce88bd
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 8 deletions.
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:cw-bmp-leeway.0
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
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 @@ -68,7 +68,7 @@ pod:
- name: MYSQL_TCP_PORT
value: 23306
- name: build
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:cw-bmp-leeway.0
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
workingDir: /workspace
imagePullPolicy: Always
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion .werft/clean-up-werft-build-nodes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pod:
type: Directory
containers:
- name: build
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:cw-bmp-leeway.0
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
workingDir: /workspace
imagePullPolicy: IfNotPresent
env:
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:cw-bmp-leeway.0
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
workingDir: /workspace
imagePullPolicy: Always
volumeMounts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pod:
secretName: gcp-sa-gitpod-release-deployer
containers:
- name: build
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:cw-bmp-leeway.0
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
workingDir: /workspace
imagePullPolicy: Always
volumeMounts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pod:
secretName: gcp-sa-gitpod-release-deployer
containers:
- name: build
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:cw-bmp-leeway.0
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
workingDir: /workspace
imagePullPolicy: Always
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:cw-bmp-leeway.0
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
workingDir: /workspace
imagePullPolicy: Always
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:cw-bmp-leeway.0
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6
workingDir: /workspace
imagePullPolicy: Always
volumeMounts:
Expand Down
4 changes: 4 additions & 0 deletions dev/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -231,5 +231,9 @@ RUN curl -LO https://github.com/brancz/gojsontoyaml/releases/download/v${GOJSONT
tar -xzvf gojsontoyaml_${GOJSONTOYAML_VERSION}_linux_amd64.tar.gz && \
sudo mv gojsontoyaml /usr/local/bin/gojsontoyaml

# Install Replicated and KOTS
RUN curl https://raw.githubusercontent.com/replicatedhq/replicated/v0.38.0/install.sh | sudo bash && \
curl https://kots.io/install/1.65.0 | bash

# Copy our own tools
COPY dev-kubecdl--app/kubecdl dev-gpctl--app/gpctl /usr/bin/

0 comments on commit 1ce88bd

Please sign in to comment.