Skip to content

Commit 0dffe76

Browse files
authored
Merge pull request #244 from newrelic/daffi/fix-glibc-errors
fix: Glibc errors
2 parents f405b42 + 168206b commit 0dffe76

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

.github/workflows/integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Test
3838
run: ./scripts/integrationTest.sh
3939
windows:
40-
runs-on: windows-2019
40+
runs-on: windows-latest
4141
steps:
4242
- name: Install Go
4343
uses: actions/setup-go@v2

dockerHelper_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func CreateDockerfile(imageName string, dockerFROM string, dockerCMD string, doc
4747
}
4848

4949
baseWindowsDockerFrom := []string{
50-
"FROM mcr.microsoft.com/windows/servercore:ltsc2019",
50+
"FROM mcr.microsoft.com/windows/servercore:ltsc2022",
5151
`SHELL ["powershell"]`,
5252
"RUN NET USER nrdiagadmin /add",
5353
"RUN NET LOCALGROUP administrators /add nrdiagadmin",

scripts/build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ VERSION=$(cat releaseVersion.txt | awk -F'majorMinor=' '{printf$2}')
3838
BUILD_TIMESTAMP=$(date -u '+%Y-%m-%d_%I:%M:%S%p')
3939
LDFLAGS="-s -w -X ${CONFIG_PATH}.Version=${VERSION}.${VERSION_NUMBER} -X ${CONFIG_PATH}.BuildTimestamp=${BUILD_TIMESTAMP} -X ${CONFIG_PATH}.USUsageEndpoint=${US_USAGE_ENDPOINT} -X ${CONFIG_PATH}.USAttachmentEndpoint=${US_ATTACHMENT_ENDPOINT} -X ${CONFIG_PATH}.USHaberdasherURL=${US_HABERDASHER_URL} -X ${CONFIG_PATH}.EUUsageEndpoint=${EU_USAGE_ENDPOINT} -X ${CONFIG_PATH}.EUAttachmentEndpoint=${EU_ATTACHMENT_ENDPOINT} -X ${CONFIG_PATH}.EUHaberdasherURL=${EU_HABERDASHER_URL}"
4040

41+
# Disable CGO to ensure we're using pure go and to fix 'version `GLIBC_2.34' not found' errors
42+
CGO_ENABLED=0
43+
4144
# Set version based on version.txt file and auto version number
4245
echo "Build version is $VERSION.$VERSION_NUMBER"
4346
echo "Buildstamp is $BUILD_TIMESTAMP"

0 commit comments

Comments
 (0)