Skip to content
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.

Sign up for GitHub

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

feat: remove python3 from the tool cache and ensure docker compose is installed #27

Merged
merged 3 commits into from
Aug 18, 2024
Merged

feat: remove python3 from the tool cache and ensure docker compose is installed #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55cd697
feat: remove python3 from the tool cache and ensure docker compose is…
nathanklick Aug 18, 2024
74ae69b
fix: use correct architecture variable
nathanklick Aug 18, 2024
0add882
fix: ensure versions are treated as strings
nathanklick Aug 18, 2024
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
21 changes: 12 additions & 9 deletions .github/workflows/zxc-build-scaleset-images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,19 +114,20 @@ jobs:
- name: Clear Hosted Tool Cache
run: rm -rvf "${{ runner.tool_cache }}"/*

- name: Setup Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
with:
python-version: '3.10'

- name: Setup Google Cloud SDK
uses: google-github-actions/setup-gcloud@f0990588f1e5b5af6827153b93673613abdc6ec7 # v2.1.1

- name: Setup Java
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
with:
distribution: temurin
java-version: 21
java-version: "21"

- name: Setup Java
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
with:
distribution: temurin
java-version: "21.0.1"

- name: Setup NodeJS 16
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
Expand All @@ -148,6 +149,11 @@ jobs:
with:
node-version: 22

- name: Setup GoLang 1.20
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: "1.20"

- name: Setup Kind
uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0
with:
Expand All @@ -161,9 +167,6 @@ jobs:
- name: Setup Helm Latest
uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0

- name: Setup QEmu Support
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0

- name: Setup Docker Buildx Support
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
with:
Expand Down
11 changes: 11 additions & 0 deletions scaleset/runner/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ RUN apt-get update -y \
zip \
gzip \
jq \
python3-pip \
htop \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand All @@ -100,6 +102,15 @@ RUN export ARCH=${TARGETARCH} \
&& curl -sL https://github.com/cli/cli/releases/download/v${GH_CLI_VERSION}/gh_${GH_CLI_VERSION}_linux_${ARCH}.tar.gz \
| tar -xz --wildcards --strip-components=2 -C /usr/local/bin "*/bin/gh" \
&& chmod +x /usr/local/bin/gh

ARG COMPOSE_VERSION=2.29.2
RUN export RUNNER_ARCH=${TARGETARCH} \
&& if [ "${RUNNER_ARCH}" = "amd64" ]; then export DOCKER_ARCH=x86_64 ; fi \
&& if [ "${RUNNER_ARCH}" = "arm64" ]; then export DOCKER_ARCH=aarch64 ; fi \
&& mkdir -p /usr/local/lib/docker/cli-plugins \
&& curl -fLo /usr/local/lib/docker/cli-plugins/docker-compose \
"https://github.com/docker/compose/releases/download/v${COMPOSE_VERSION}/docker-compose-linux-${DOCKER_ARCH}" \
&& chmod +x /usr/local/lib/docker/cli-plugins/docker-compose
#########################################
## End OS Software Customizations ##
#########################################
Expand Down
Loading