Skip to content

Commit

Permalink
Merge pull request shadowsocks#133 from mritd/chore/docker
Browse files Browse the repository at this point in the history
chore(docker): update images, remove bash
  • Loading branch information
riobard authored Apr 30, 2019
2 parents a31551f + a69e624 commit d43d83c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM golang:1.11.3-alpine3.8 AS builder
FROM golang:1.12.4-alpine3.9 AS builder

RUN apk upgrade \
&& apk add git \
&& go get -ldflags '-w -s' \
github.com/shadowsocks/go-shadowsocks2

FROM alpine:3.8
FROM alpine:3.9 AS dist

LABEL maintainer="mritd <mritd1234@gmail.com>"
LABEL maintainer="mritd <mritd@linux.com>"

RUN apk upgrade \
&& apk add bash tzdata \
&& apk add tzdata \
&& rm -rf /var/cache/apk/*

COPY --from=builder /go/bin/go-shadowsocks2 /usr/bin/shadowsocks
Expand Down

0 comments on commit d43d83c

Please sign in to comment.