diff --git a/.github/actions/external_runner/go.mod b/.github/actions/external_runner/go.mod index 38087113d..2530ac18c 100644 --- a/.github/actions/external_runner/go.mod +++ b/.github/actions/external_runner/go.mod @@ -1,6 +1,6 @@ module main -go 1.20 +go 1.19 require ( github.com/aws/aws-sdk-go-v2 v1.16.4 diff --git a/build/Dockerfile b/build/Dockerfile index 973e793ee..b5d5939c5 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.2-bullseye +FROM golang:1.19.5-bullseye ARG GH_VERSION='2.0.0' ARG GH_ARCH='amd64' @@ -16,4 +16,4 @@ RUN curl -L https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_ RUN dpkg -i gh_${GH_VERSION}_linux_${GH_ARCH}.deb ENV GOFLAGS="-buildvcs=false" -RUN git config --global --add safe.directory /go/src/github.com/newrelic/infrastructure-agent \ No newline at end of file +RUN git config --global --add safe.directory /go/src/github.com/newrelic/infrastructure-agent diff --git a/build/ci/Dockerfile b/build/ci/Dockerfile index 9dfbd4d5a..882c9e2e6 100644 --- a/build/ci/Dockerfile +++ b/build/ci/Dockerfile @@ -5,7 +5,7 @@ ARG ANSIBLE_INVENTORY_FOLDER_ARG="/srv/runner/inventory/$REF_ARG" ARG ANSIBLE_INVENTORY_FILE_ARG="inventory.ec2" ARG ANSIBLE_VERSION="6.5.0" -ARG GO_VERSION="1.20.2" +ARG GO_VERSION="1.19.5" ENV REF=$REF_ARG ENV ANSIBLE_INVENTORY="$ANSIBLE_INVENTORY_FOLDER_ARG/$ANSIBLE_INVENTORY_FILE_ARG" diff --git a/build/embed/integrations.version b/build/embed/integrations.version index 97e8784ee..87f744e6b 100644 --- a/build/embed/integrations.version +++ b/build/embed/integrations.version @@ -1,5 +1,5 @@ #ohi-repo-name,version nri-docker,v1.8.0 -nri-flex,v1.8.0 +nri-flex,v1.7.2 nri-winservices,v1.0.0 nri-prometheus,v2.18.0 diff --git a/go.mod b/go.mod index 83efdf341..3079dec98 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/newrelic/infrastructure-agent -go 1.20 +go 1.19 require ( github.com/Microsoft/go-winio v0.5.1 diff --git a/test/databind/fargate/Dockerfile_test b/test/databind/fargate/Dockerfile_test index 52291e4dc..8a20e87b0 100644 --- a/test/databind/fargate/Dockerfile_test +++ b/test/databind/fargate/Dockerfile_test @@ -1,7 +1,7 @@ -FROM golang:1.20 +FROM golang:1.19 WORKDIR /go/src/github.com/newrelic/infrastructure-agent/ COPY . . -CMD ["sleep", "1h"] \ No newline at end of file +CMD ["sleep", "1h"] diff --git a/test/packaging/ansible/roles/repo-setup/vars/main.yaml b/test/packaging/ansible/roles/repo-setup/vars/main.yaml index 9ffcf757c..abf203fcf 100644 --- a/test/packaging/ansible/roles/repo-setup/vars/main.yaml +++ b/test/packaging/ansible/roles/repo-setup/vars/main.yaml @@ -1,5 +1,5 @@ --- -go_version: 1.20 +go_version: 1.19 repo_endpoint: "http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/infrastructure_agent" repos_to_clean: diff --git a/test/proxy/Dockerfile_agent b/test/proxy/Dockerfile_agent index 51212d4fc..14d197d8c 100644 --- a/test/proxy/Dockerfile_agent +++ b/test/proxy/Dockerfile_agent @@ -1,4 +1,4 @@ -FROM golang:1.20 as builder +FROM golang:1.19 as builder ARG CGO_ENABLED=0 WORKDIR /go/src/github.com/newrelic/infrastructure-agent diff --git a/test/proxy/Dockerfile_collector b/test/proxy/Dockerfile_collector index f779817c8..c7ddfb2b5 100644 --- a/test/proxy/Dockerfile_collector +++ b/test/proxy/Dockerfile_collector @@ -1,4 +1,4 @@ -FROM golang:1.20 as builder +FROM golang:1.19 as builder ARG CGO_ENABLED=0 WORKDIR /go/src/github.com/newrelic/infrastructure-agent COPY . . diff --git a/tools/cdn-purge/go.mod b/tools/cdn-purge/go.mod index 27f0facef..c6ac5409c 100644 --- a/tools/cdn-purge/go.mod +++ b/tools/cdn-purge/go.mod @@ -1,6 +1,6 @@ module github.com/newrelic/infrastructure-agent/tools/cdn-purge -go 1.20 +go 1.19 require github.com/aws/aws-sdk-go v1.39.0 diff --git a/tools/provision-alerts/go.mod b/tools/provision-alerts/go.mod index 9cbd84d43..63d866d57 100644 --- a/tools/provision-alerts/go.mod +++ b/tools/provision-alerts/go.mod @@ -1,6 +1,6 @@ module provision-alerts -go 1.20 +go 1.19 require ( github.com/stretchr/testify v1.7.0 diff --git a/tools/spin-ec2/go.mod b/tools/spin-ec2/go.mod index 4ebb4b987..d0ec57fab 100644 --- a/tools/spin-ec2/go.mod +++ b/tools/spin-ec2/go.mod @@ -1,6 +1,6 @@ module spin-ec2 -go 1.20 +go 1.19 require ( github.com/spf13/cobra v1.2.1