Skip to content

Commit

Permalink
Upgrade go version to 1.21
Browse files Browse the repository at this point in the history
Also upgraded base image to Alpine 3.19.0 to fix the following CVEs:
CVE-2023-5363
CVE-2023-6129
CVE-2023-5678
  • Loading branch information
y2kenny-amd committed Jan 12, 2024
1 parent e4964d9 commit 36fc289
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM docker.io/golang:1.19.13-alpine3.18
FROM docker.io/golang:1.21.6-alpine3.19
RUN apk --no-cache add git pkgconfig build-base libdrm-dev
RUN apk --no-cache add hwloc-dev --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community
RUN mkdir -p /go/src/github.com/RadeonOpenCompute/k8s-device-plugin
Expand All @@ -20,7 +20,7 @@ WORKDIR /go/src/github.com/RadeonOpenCompute/k8s-device-plugin/cmd/k8s-device-pl
RUN go install \
-ldflags="-X main.gitDescribe=$(git -C /go/src/github.com/RadeonOpenCompute/k8s-device-plugin/ describe --always --long --dirty)"

FROM alpine:3.18.4
FROM alpine:3.19.0
LABEL \
org.opencontainers.image.source="https://github.com/RadeonOpenCompute/k8s-device-plugin" \
org.opencontainers.image.authors="Kenny Ho <[email protected]>" \
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/RadeonOpenCompute/k8s-device-plugin

go 1.19
go 1.21

require (
github.com/go-logr/logr v1.2.3
Expand Down
4 changes: 2 additions & 2 deletions labeller.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM docker.io/golang:1.19.13-alpine3.18
FROM docker.io/golang:1.21.6-alpine3.19
RUN apk --no-cache add git pkgconfig build-base libdrm-dev
RUN mkdir -p /go/src/github.com/RadeonOpenCompute/k8s-device-plugin
ADD . /go/src/github.com/RadeonOpenCompute/k8s-device-plugin
WORKDIR /go/src/github.com/RadeonOpenCompute/k8s-device-plugin/cmd/k8s-node-labeller
RUN go install \
-ldflags="-X main.gitDescribe=$(git -C /go/src/github.com/RadeonOpenCompute/k8s-device-plugin/ describe --always --long --dirty)"

FROM alpine:3.18.4
FROM alpine:3.19.0
LABEL \
org.opencontainers.image.source="https://github.com/RadeonOpenCompute/k8s-device-plugin" \
org.opencontainers.image.authors="Kenny Ho <[email protected]>" \
Expand Down

0 comments on commit 36fc289

Please sign in to comment.