Skip to content

Commit

Permalink
Merge pull request #100 from mgfeller/feature/mgfeller/98
Browse files Browse the repository at this point in the history
[Code] Refactored to use meshery-adapter-library
  • Loading branch information
kumarabd authored Oct 29, 2020
2 parents 428a032 + ffa1ffa commit afe7f80
Show file tree
Hide file tree
Showing 19 changed files with 921 additions and 1,852 deletions.
16 changes: 9 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
FROM golang:1.13 as bd
RUN adduser --disabled-login appuser
WORKDIR /github.com/layer5io/meshery-consul
ADD . .
RUN GOPROXY=direct GOSUMDB=off go build -ldflags="-w -s" -a -o /meshery-consul .
RUN find . -name "*.go" -type f -delete; mv consul /

FROM alpine
RUN apk --update add ca-certificates
RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
COPY --from=bd /meshery-consul /app/
COPY --from=bd /consul /app/consul
COPY --from=bd /etc/passwd /etc/passwd
RUN addgroup -S appgroup && adduser -S appuser -G appgroup
RUN apk --update add ca-certificates && \
mkdir /lib64 && \
ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2

USER appuser
WORKDIR /app
RUN mkdir -p /home/appuser/.kube
WORKDIR /home/appuser
COPY --from=bd /meshery-consul /home/appuser
COPY --from=bd /consul /home/appuser/consul
CMD ./meshery-consul
115 changes: 0 additions & 115 deletions consul/client.go

This file was deleted.

5 changes: 0 additions & 5 deletions consul/config_templates/namespace.yml

This file was deleted.

Loading

0 comments on commit afe7f80

Please sign in to comment.