Skip to content

Commit

Permalink
Upgrade Go to 1.20.5 - bump to v1.17.0 (#132)
Browse files Browse the repository at this point in the history
* feat: update golang to 1.20.5

* feat: version bump to 1.16.1

* feat: update windows docker image to include .net4.8 required by chocolatey

* feat: update windows docker image for nrBuilder stage

* feat: use correct windows tags

* feat: version bump to 1.17.0

* feat: rollback windows version changes

* feat: use correct go version
  • Loading branch information
danybmx committed Jun 14, 2023
1 parent 8e3aa7c commit 6e640c1
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/merge-to-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-20.04

steps:
- name: Set up Go ^1.20
- name: Set up Go ^1.20.5
uses: actions/setup-go@v2
with:
go-version: ^1.20
go-version: ^1.20.5

- name: Check go version
run: go version
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-20.04

steps:
- name: Set up Go ^1.20
- name: Set up Go ^1.20.5
uses: actions/setup-go@v2
with:
go-version: ^1.20
go-version: ^1.20.5
id: go

- name: Check go version
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14 AS builder
FROM golang:1.20.5 AS builder

WORKDIR /go/src/github.com/newrelic/newrelic-fluent-bit-output

Expand Down
11 changes: 9 additions & 2 deletions Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ WORKDIR /build

USER ContainerAdministrator

ENV chocolateyVersion 1.4.0

# Install Chocolatey
RUN powershell.exe Invoke-WebRequest `
-Uri https://chocolatey.org/install.ps1 `
Expand All @@ -26,7 +28,7 @@ RUN setx PATH "%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"

# Install Base Dependencies
RUN choco install --yes --no-progress mingw git
RUN choco install --yes --no-progress golang --version=1.14
RUN choco install --yes --no-progress golang --version=1.20.5

# Put the path before the other paths so that MinGW shadows Windows commands.
RUN setx PATH "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw\bin;%PATH%"
Expand Down Expand Up @@ -62,6 +64,11 @@ FROM mcr.microsoft.com/windows/servercore:$WINDOWS_VERSION as builder

ARG FLUENTBIT_VERSION

# This line was added because chocolatey version 2.0 was released and it depends on .NET 4.8
# We can update this with the approach that fluent-bit takes but at the moment of doing this change
# the fluent-bit image is not updated (and not working anymore)
ENV chocolateyVersion 1.4.0

# Install Chocolatey
RUN powershell.exe Invoke-WebRequest `
-Uri https://chocolatey.org/install.ps1 `
Expand Down Expand Up @@ -179,4 +186,4 @@ ENTRYPOINT [ "fluent-bit.exe" ]

COPY --from=nrBuilder /build/out_newrelic.dll /fluent-bit/bin/out_newrelic.dll

CMD ["fluent-bit.exe", "-i", "dummy", "-o", "stdout", "-e", "/fluent-bit/bin/out_newrelic.dll"]
CMD ["fluent-bit.exe", "-i", "dummy", "-o", "stdout", "-e", "/fluent-bit/bin/out_newrelic.dll"]
2 changes: 1 addition & 1 deletion Dockerfile_debug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14 AS builder
FROM golang:1.20.5 AS builder

WORKDIR /go/src/github.com/newrelic/newrelic-fluent-bit-output

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_firelens
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14 AS builder
FROM golang:1.20.5 AS builder

WORKDIR /go/src/github.com/newrelic/newrelic-fluent-bit-output

Expand Down
2 changes: 1 addition & 1 deletion version.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package main

const VERSION = "1.16.0"
const VERSION = "1.17.0"

0 comments on commit 6e640c1

Please sign in to comment.