DeineAgenturUG/go-xmlsec
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update GO to 1.7.3 and cleanup formatting

Browse Source
This commit is contained in:
Nicola Asuni
2016-11-14 11:55:23 +00:00
parent 00603d7575
commit 748ef44fe9
2 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile.build
View File

@@ -2,13 +2,13 @@ FROM ubuntu
RUN apt-get update -yy && \ RUN apt-get update -yy && \
apt-get install -yy git make curl libxml2-dev libxmlsec1-dev liblzma-dev pkg-config apt-get install -yy git make curl libxml2-dev libxmlsec1-dev liblzma-dev pkg-config
RUN curl -s https://storage.googleapis.com/golang/go1.7.linux-amd64.tar.gz | tar -C /usr/local -xzf - RUN curl -s https://storage.googleapis.com/golang/go1.7.3.linux-amd64.tar.gz | tar -C /usr/local -xzf -
ENV GOPATH=/go ENV GOPATH=/go
ENV PATH=$PATH:/usr/local/go/bin:/go/bin ENV PATH=$PATH:/usr/local/go/bin:/go/bin
RUN mkdir -p /go/bin RUN mkdir -p /go/bin
ADD . /go/src/github.com/andy-miracl/go-xmlsec ADD . /go/src/github.com/miracl/go-xmlsec
WORKDIR /go/src/github.com/andy-miracl/go-xmlsec WORKDIR /go/src/github.com/miracl/go-xmlsec
RUN go get github.com/crewjam/errset RUN go get github.com/crewjam/errset
RUN go build -o /bin/xmldsig ./examples/xmldsig.go RUN go build -o /bin/xmldsig ./examples/xmldsig.go

9
Dockerfile.build-static
View File

@@ -2,7 +2,7 @@ FROM ubuntu:16.04
RUN apt-get update -yy && \ RUN apt-get update -yy && \
apt-get install -yy git make curl pkg-config apt-get install -yy git make curl pkg-config
RUN curl -s https://storage.googleapis.com/golang/go1.7.linux-amd64.tar.gz | tar -C /usr/local -xzf - RUN curl -s https://storage.googleapis.com/golang/go1.7.3.linux-amd64.tar.gz | tar -C /usr/local -xzf -
ENV GOPATH=/go ENV GOPATH=/go
ENV PATH=$PATH:/usr/local/go/bin:/go/bin ENV PATH=$PATH:/usr/local/go/bin:/go/bin
RUN mkdir -p /go/bin RUN mkdir -p /go/bin
@@ -53,8 +53,7 @@ RUN curl -sL ftp://xmlsoft.org/libxml2/libxml2-2.9.4.tar.gz | tar -xzf - && \
--without-coverage && \ --without-coverage && \
make install make install
RUN \ RUN curl -sL ftp://ftp.openssl.org/source/openssl-1.0.2j.tar.gz | tar -xzf - && \
curl -sL ftp://ftp.openssl.org/source/openssl-1.0.2j.tar.gz | tar -xzf - && \
cd openssl-1.0.2j && \ cd openssl-1.0.2j && \
./config \ ./config \
no-shared \ no-shared \
@@ -90,8 +89,8 @@ RUN curl -sL http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.22.tar.gz | tar
make -C include install && \ make -C include install && \
make install-pkgconfigDATA make install-pkgconfigDATA
ADD . /go/src/github.com/andy-miracl/go-xmlsec ADD . /go/src/github.com/miracl/go-xmlsec
WORKDIR /go/src/github.com/andy-miracl/go-xmlsec WORKDIR /go/src/github.com/miracl/go-xmlsec
RUN go get github.com/crewjam/errset RUN go get github.com/crewjam/errset
RUN go build -tags static -ldflags '-s -extldflags "-static"' -o /bin/xmldsig ./examples/xmldsig.go RUN go build -tags static -ldflags '-s -extldflags "-static"' -o /bin/xmldsig ./examples/xmldsig.go
RUN ldd /bin/xmldsig || true RUN ldd /bin/xmldsig || true