Skip to content

Commit

Permalink
Fix docker files after hadolint check
Browse files Browse the repository at this point in the history
  • Loading branch information
MichalGuzieniuk authored and killianmuldoon committed Sep 29, 2020
1 parent 538f9d4 commit c0fdaf0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
@@ -1,21 +1,21 @@
FROM golang:alpine as builder

ADD . /usr/src/sriov-cni
COPY . /usr/src/sriov-cni

ENV HTTP_PROXY $http_proxy
ENV HTTPS_PROXY $https_proxy

RUN apk add --update --virtual build-dependencies build-base linux-headers && \
cd /usr/src/sriov-cni && \
WORKDIR /usr/src/sriov-cni
RUN apk add --no-cache --virtual build-dependencies build-base=~0.5 && \
make clean && \
make build

FROM alpine
FROM alpine:3
COPY --from=builder /usr/src/sriov-cni/build/sriov /usr/bin/
WORKDIR /

LABEL io.k8s.display-name="SR-IOV CNI"

ADD ./images/entrypoint.sh /
COPY ./images/entrypoint.sh /

ENTRYPOINT ["/entrypoint.sh"]
4 changes: 2 additions & 2 deletions Dockerfile.rhel7
@@ -1,6 +1,6 @@
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder

ADD . /usr/src/sriov-cni
COPY . /usr/src/sriov-cni

WORKDIR /usr/src/sriov-cni
RUN make clean && \
Expand All @@ -12,6 +12,6 @@ WORKDIR /

LABEL io.k8s.display-name="SR-IOV CNI"

ADD ./images/entrypoint.sh /
COPY ./images/entrypoint.sh /

ENTRYPOINT ["/entrypoint.sh"]

0 comments on commit c0fdaf0

Please sign in to comment.