Skip to content

Commit 9687b70

Browse files
Jarek Lisickialdor007
Jarek Lisicki
authored andcommitted
Simplify go.mod and migrate to golang 1.16
1 parent 2c35918 commit 9687b70

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

.dockerignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
src/*
2-
vendor/*
2+
vendor
33
node_modules/*

Dockerfile

+5-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ubuntu:20.04 as builder
33
# ENV LIBVIPS_VERSION 8.7.3
44
ENV LIBVIPS_VERSION 8.10.2
55
ENV DEP_VERSION v0.5.1
6-
ENV GOLANG_VERSION 1.15.8
6+
ENV GOLANG_VERSION 1.16.4
77
ARG TARGETARCH amd64
88

99
# Installs libvips + required libraries
@@ -46,11 +46,10 @@ ENV PATH $WORKDIR/bin:/usr/local/go/bin:$PATH
4646

4747
RUN mkdir -p "$WORKDIR/src" "$WORKDIR/bin" && chmod -R 777 "$WORKDIR"
4848
WORKDIR $WORKDIR
49-
# RUN curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/$DEP_VERSION/dep-linux-amd64 && chmod +x /usr/local/bin/dep
50-
ADD . /go/src/github.com/aldor007/mort
49+
ADD . /go/src
5150

5251
# RUN cd /go/src/github.com/aldor007/mort && dep ensure -vendor-only
53-
RUN cd /go/src/github.com/aldor007/mort; go build -o /go/mort cmd/mort/mort.go;
52+
RUN cd /go/src; go build -o /go/mort cmd/mort/mort.go;
5453

5554
FROM ubuntu:20.04
5655

@@ -73,13 +72,12 @@ RUN rm -rf /go/src; rm -rf /usr/share/; rm -rf /usr/include/
7372
COPY --from=builder /usr/local/lib /usr/local/lib
7473
RUN ldconfig
7574
COPY --from=builder /go/mort /go/mort
76-
COPY --from=builder /go/src/github.com/aldor007/mort/configuration/config.yml /etc/mort/mort.yml
77-
RUN /go/mort -version
75+
COPY --from=builder /go/src/configuration/config.yml /etc/mort/mort.yml
7876
# add mime types
7977
ADD http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/conf/mime.types?view=co /etc/mime.types
8078

79+
RUN /go/mort -version
8180
# Run the outyet command by default when the container starts.
8281
ENTRYPOINT ["/go/mort"]
83-
8482
# Expose the server TCP port
8583
EXPOSE 8080 8081

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/aldor007/mort
22

3-
go 1.15
3+
go 1.16
44

55
require (
66
github.com/aldor007/go-aws-auth v0.0.0-20180623204207-00898dfb9272

0 commit comments

Comments
 (0)