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

Resolve almalinux8/ubuntu2004 build image ppc64le compatibility issues (part 2) #4517

Merged
merged 1 commit into from
Mar 8, 2024
Merged

Resolve almalinux8/ubuntu2004 build image ppc64le compatibility issues (part 2) #4517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion docker/ci/config/windows-setup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ bash.exe -c "mv -v 'C:\\Windows\\System32\\find.exe' 'C:\\Windows\\System32\\fin

# Add some sleep due to a potential race condition
Start-Sleep -Seconds 10
Set-MpPreference -DisableRealtimeMonitoring $true

# Setup Repos (This has to happen after git is installed or will error out)
scoop bucket add java
Expand Down
2 changes: 1 addition & 1 deletion docker/ci/dockerfiles/current/docker-builder.ubuntu2004.x64.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,5 @@ RUN curl -SL -o- https://apt.releases.hashicorp.com/gpg | gpg --dearmor > /usr/s

# Tools setup
COPY --chown=0:0 config/yq-setup.sh config/gh-setup.sh /tmp/
RUN apt-get install -y golang-go && /tmp/yq-setup.sh && /tmp/gh-setup.sh
RUN apt-get install -y golang-go golang-1.21-go && update-alternatives --install /usr/bin/go go /usr/lib/go-1.21/bin/go 1 && /tmp/yq-setup.sh && /tmp/gh-setup.sh

Loading