Skip to content

Commit

Permalink
Merge pull request #1 from fireeye/feat/go_1.9.2_docker
Browse files Browse the repository at this point in the history
docker: Add support for Go 1.9.2
  • Loading branch information
tankbusta authored Oct 27, 2017
2 parents 5c794af + fdbe4a5 commit 1618023
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 97 deletions.
19 changes: 9 additions & 10 deletions docker/Dockerfile.build.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,21 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ocl-icd-opencl-dev \
&& rm -rf /var/lib/apt/lists/*

ENV GOLANG_VERSION 1.9
ENV GOLANG_VERSION 1.9.2

# There is no golang ubuntu image for ubuntu:xenial :( https://github.com/docker-library/golang
RUN set -eux; \
\
# this "case" statement is generated via "update.sh"
dpkgArch="$(dpkg --print-architecture)"; \
case "${dpkgArch##*-}" in \
amd64) goRelArch='linux-amd64'; goRelSha256='d70eadefce8e160638a9a6db97f7192d8463069ab33138893ad3bf31b0650a79' ;; \
armhf) goRelArch='linux-armv6l'; goRelSha256='f52ca5933f7a8de2daf7a3172b0406353622c6a39e67dd08bbbeb84c6496f487' ;; \
arm64) goRelArch='linux-arm64'; goRelSha256='0958dcf454f7f26d7acc1a4ddc34220d499df845bc2051c14ff8efdf1e3c29a6' ;; \
i386) goRelArch='linux-386'; goRelSha256='7cccff99dacf59162cd67f5b11070d667691397fd421b0a9ad287da019debc4f' ;; \
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='10b66dae326b32a56d4c295747df564616ec46ed0079553e88e39d4f1b2ae985' ;; \
s390x) goRelArch='linux-s390x'; goRelSha256='e06231e4918528e2eba1d3cff9bc4310b777971e5d8985f9772c6018694a3af8' ;; \
*) goRelArch='src'; goRelSha256='a4ab229028ed167ba1986825751463605264e44868362ca8e7accc8be057e993'; \
amd64) goRelArch='linux-amd64'; goRelSha256='de874549d9a8d8d8062be05808509c09a88a248e77ec14eb77453530829ac02b' ;; \
armhf) goRelArch='linux-armv6l'; goRelSha256='8a6758c8d390e28ef2bcea511f62dcb43056f38c1addc06a8bc996741987e7bb' ;; \
arm64) goRelArch='linux-arm64'; goRelSha256='0016ac65ad8340c84f51bc11dbb24ee8265b0a4597dbfdf8d91776fc187456fa' ;; \
i386) goRelArch='linux-386'; goRelSha256='574b2c4b1a248e58ef7d1f825beda15429610a2316d9cbd3096d8d3fa8c0bc1a' ;; \
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='adb440b2b6ae9e448c253a20836d8e8aa4236f731d87717d9c7b241998dc7f9d' ;; \
s390x) goRelArch='linux-s390x'; goRelSha256='a7137b4fbdec126823a12a4b696eeee2f04ec616e9fb8a54654c51d5884c1345' ;; \
*) goRelArch='src'; goRelSha256='665f184bf8ac89986cfd5a4460736976f60b57df6b320ad71ad4cef53bb143dc'; \
echo >&2; echo >&2 "warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; echo >&2 ;; \
esac; \
\
Expand Down Expand Up @@ -70,8 +71,6 @@ ENV LD_LIBRARY_PATH /usr/local/nvidia/lib:/usr/local/nvidia/lib64
ENV GOPATH /go
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH

COPY files/go-wrapper /usr/local/bin/

COPY external/hashcat/deps/OpenCL-Headers/CL /usr/local/include/CL
COPY external/hashcat/include /usr/local/include/hashcat
COPY dist/hashcat/lib/libhashcat.so /usr/local/lib/
Expand Down
87 changes: 0 additions & 87 deletions docker/files/go-wrapper

This file was deleted.

0 comments on commit 1618023

Please sign in to comment.