Skip to content

Commit

Permalink
fix: Resolved all comments made by Lenny for Makefile and Dockerfile
Browse files Browse the repository at this point in the history
Signed-off-by: Marc-philippe Fuller <marc-philippe.fuller@intel.com>
  • Loading branch information
marcpfuller committed Jan 6, 2022
1 parent 07c5e43 commit 4a2ba1a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ARG ALPINE_PKG_EXTRA=""
RUN sed -e 's/dl-cdn[.]alpinelinux.org/nl.alpinelinux.org/g' -i~ /etc/apk/repositories
RUN apk add --no-cache ${ALPINE_PKG_BASE} ${ALPINE_PKG_EXTRA}

WORKDIR $GOPATH/src/github.com/edgexfoundry/device-rfid-llrp-go
WORKDIR /app

COPY . .
RUN [ ! -d "vendor" ] && go mod download all || echo "skipping..."
Expand All @@ -40,11 +40,11 @@ LABEL license='SPDX-License-Identifier: Apache-2.0' \
RUN sed -e 's/dl-cdn[.]alpinelinux.org/nl.alpinelinux.org/g' -i~ /etc/apk/repositories
RUN apk add --update --no-cache zeromq dumb-init

COPY --from=builder /go/src/github.com/edgexfoundry/device-rfid-llrp-go/LICENSE /
COPY --from=builder /go/src/github.com/edgexfoundry/device-rfid-llrp-go/Attribution.txt /
COPY --from=builder /go/src/github.com/edgexfoundry/device-rfid-llrp-go/cmd /
COPY --from=builder /app/device-rfid-llrp-go/LICENSE /
COPY --from=builder /app/device-rfid-llrp-go/Attribution.txt /
COPY --from=builder /app/device-rfid-llrp-go/cmd /

EXPOSE 59989

ENTRYPOINT ["/device-rfid-llrp-go"]
ENTRYPOINT ["/device-rfid-llrp"]
CMD ["-cp=consul.http://edgex-core-consul:8500", "--confdir=/res", "--registry"]
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ MICROSERVICES=cmd/device-rfid-llrp-go

.PHONY: $(MICROSERVICES)

DOCKERS=docker_device_rfid_llrp_go
.PHONY: $(DOCKERS)

VERSION=$(shell cat ./VERSION 2>/dev/null || echo 0.0.0)

GIT_SHA=$(shell git rev-parse HEAD)
Expand All @@ -32,9 +29,7 @@ test:
clean:
rm -f $(MICROSERVICES)

docker: $(DOCKERS)

docker_device_rfid_llrp_go:
docker:
docker build \
--build-arg http_proxy \
--build-arg https_proxy \
Expand Down

0 comments on commit 4a2ba1a

Please sign in to comment.