Browse Source

Fix Dockerfile

DarthSim 6 years ago
parent
commit
29982e2d1a
1 changed files with 6 additions and 7 deletions
  1. 6 7
      Dockerfile

+ 6 - 7
Dockerfile

@@ -1,15 +1,13 @@
 FROM alpine:edge
 FROM alpine:edge
-MAINTAINER Sergey Aleksandrovich <darthsim@gmail.com>
+LABEL maintainer="Sergey Alexandrovich <darthsim@gmail.com>"
 
 
 ENV GOPATH /go
 ENV GOPATH /go
 ENV PATH /usr/local/go/bin:$PATH
 ENV PATH /usr/local/go/bin:$PATH
 
 
-RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
-
 ADD . /go/src/github.com/DarthSim/imgproxy
 ADD . /go/src/github.com/DarthSim/imgproxy
 
 
 RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
 RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
-  && apk add --no-cache --update bash vips ca-certificates \
+  && apk --no-cache upgrade \
   && apk add --no-cache --virtual .build-deps go gcc musl-dev fftw-dev vips-dev \
   && apk add --no-cache --virtual .build-deps go gcc musl-dev fftw-dev vips-dev \
   && cd /go/src/github.com/DarthSim/imgproxy \
   && cd /go/src/github.com/DarthSim/imgproxy \
   && CGO_LDFLAGS_ALLOW="-s|-w" go build -v -o /usr/local/bin/imgproxy \
   && CGO_LDFLAGS_ALLOW="-s|-w" go build -v -o /usr/local/bin/imgproxy \
@@ -17,10 +15,11 @@ RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/reposit
   && rm -rf /var/cache/apk*
   && rm -rf /var/cache/apk*
 
 
 FROM alpine:edge
 FROM alpine:edge
+LABEL maintainer="Sergey Alexandrovich <darthsim@gmail.com>"
 
 
-RUN \
-  && echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
-  && apk --no-cache add ca-certificates bash vips \
+RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
+  && apk --no-cache upgrade \
+  && apk add --no-cache ca-certificates bash vips \
   && rm -rf /var/cache/apk*
   && rm -rf /var/cache/apk*
 
 
 COPY --from=0 /usr/local/bin/imgproxy /usr/local/bin
 COPY --from=0 /usr/local/bin/imgproxy /usr/local/bin