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.

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

chore: bump some dependencies #47

Merged
merged 1 commit into from
Jun 26, 2020
Merged

chore: bump some dependencies #47

merged 1 commit into from
Jun 26, 2020

Conversation

palmerabollo
Copy link
Member

  • Remove github.com/containous/traefik/log (use logrus instead)
  • Bump some mod versions (gin, etc). Upgrading librdkafka to 1.4.x and prometheus to 1.x is also recommended but it breaks current code, so it's not included in this PR.
  • Include go test in the build process to avoid releasing versions that don't pass the unit tests by mistake.

Copy link
Contributor

@jpfe-tid jpfe-tid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll apply the suggestions in a separate PR.

@@ -1,14 +1,15 @@
FROM golang:1.14.1-alpine3.11 as build
FROM golang:1.14.4-alpine3.11 as build
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RUN echo "@edge http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \
echo "@edgecommunity http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
apk add --no-cache alpine-sdk 'librdkafka@edgecommunity>=1.3.0' 'librdkafka-dev@edgecommunity>=1.3.0'

WORKDIR /src/prometheus-kafka-adapter
ADD . /src/prometheus-kafka-adapter

RUN go test
RUN go build -o /prometheus-kafka-adapter

FROM alpine:3.11
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FROM alpine:3.11
FROM alpine:3.12

"github.com/gin-gonic/contrib/ginrus"
"github.com/gin-gonic/gin"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/log"
"github.com/sirupsen/logrus"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"

"github.com/gin-gonic/contrib/ginrus"
"github.com/gin-gonic/gin"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/log"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"github.com/prometheus/common/log"

@jpfe-tid jpfe-tid merged commit 18e8765 into master Jun 26, 2020
@palmerabollo palmerabollo deleted the hardening-libs branch June 28, 2020 11:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants