Skip to content

Commit

Permalink
fix: add necessary configuration for devcontainer with ARM arch (#3085)
Browse files Browse the repository at this point in the history
Co-authored-by: Xoán Mallón <[email protected]>
  • Loading branch information
xoanmm and xoanmm authored May 30, 2022
1 parent 7c6f733 commit 9fab913
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ RUN apt-get update \
# Docker install
&& apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common lsb-release \
&& curl -fsSL https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/gpg | apt-key add - 2>/dev/null \
&& add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" \
&& add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" \
&& apt-get update \
&& apt-get install -y docker-ce-cli \
#
Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/pr-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,41 @@ jobs:
if: steps.filter.outputs.devcontainer == 'true'
run: make docker-build-dev-containers

validate-dev-container-arm64:
name: Validate dev-container on ARM64
runs-on: ARM64
container: arm64v8/ubuntu:focal
env:
DEBIAN_FRONTEND: noninteractive
steps:
- uses: actions/checkout@v3

- uses: dorny/paths-filter@v2
id: filter
with:
filters: |
devcontainer:
- '.devcontainer/Dockerfile'
- name: Setup Go
if: steps.filter.outputs.devcontainer == 'true'
uses: actions/setup-go@v3
with:
go-version: 1.17

- name: Install deps
if: steps.filter.outputs.devcontainer == 'true'
run: |
apt update && apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common lsb-release make
curl -fsSL https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/gpg | apt-key add - 2>/dev/null
add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable"
apt-get update
apt-get install -y docker-ce-cli
- name: Build tools
if: steps.filter.outputs.devcontainer == 'true'
run: make docker-build-dev-containers

statics:
name: Static Checks
runs-on: ubuntu-latest
Expand Down
6 changes: 2 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,8 @@ To learn more about our roadmap, we recommend reading [this document](ROADMAP.md

### Fixes

- **General:** Use metricName from GetMetricsSpec in ScaledJobs instead of `queueLength` ([#3032](https://github.com/kedacore/keda/issue/3032))

### Fixes

- **General:** Refactor adapter startup to ensure proper log initilization. ([2316](https://github.com/kedacore/keda/issues/2316))
- **General:** Use metricName from GetMetricsSpec in ScaledJobs instead of `queueLength` ([#3032](https://github.com/kedacore/keda/issue/3032))

### Deprecations

Expand All @@ -63,6 +60,7 @@ To learn more about our roadmap, we recommend reading [this document](ROADMAP.md
### Other

- **General:** Improve e2e on PR process. ([3004](https://github.com/kedacore/keda/issues/3004))
- **General:** Fix devcontainer on ARM64 Arch. ([3084](https://github.com/kedacore/keda/issues/3084))

## v2.7.1

Expand Down

0 comments on commit 9fab913

Please sign in to comment.