From ee3a9c7bcf29c3b7ae6f8c0dfae667e4c8a6505e Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Wed, 17 Apr 2019 21:01:01 +0000 Subject: [PATCH 1/3] Update Go version to 1.12.6 Let's update to the latest Go version since it has several security fixes. --- build_dockers.bsh | 2 +- centos_6.Dockerfile | 2 +- centos_7.Dockerfile | 2 +- commit_tags.bsh | 2 +- debian_7.Dockerfile | 2 +- debian_8.Dockerfile | 2 +- debian_9.Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build_dockers.bsh b/build_dockers.bsh index 803a9e1..b66ec86 100755 --- a/build_dockers.bsh +++ b/build_dockers.bsh @@ -11,7 +11,7 @@ set -eu CUR_DIR=$(dirname "${BASH_SOURCE[0]}") -: ${GOLANG_VERSION:=1.11.1} +: ${GOLANG_VERSION:=1.12.6} export GOLANG_VERSION #If you are not in docker group and you have sudo, default value is sudo diff --git a/centos_6.Dockerfile b/centos_6.Dockerfile index 3906e08..31c864a 100644 --- a/centos_6.Dockerfile +++ b/centos_6.Dockerfile @@ -14,7 +14,7 @@ RUN yum install -y gcc libcurl-devel gettext-devel openssl-devel perl-CPAN perl- make install && \ git --version -ARG GOLANG_VERSION=1.11.1 +ARG GOLANG_VERSION=1.12.6 ENV GOROOT=/usr/local/go diff --git a/centos_7.Dockerfile b/centos_7.Dockerfile index 40e430d..dc25691 100644 --- a/centos_7.Dockerfile +++ b/centos_7.Dockerfile @@ -14,7 +14,7 @@ RUN yum install -y gettext-devel libcurl-devel openssl-devel perl-CPAN perl-deve make install && \ git --version -ARG GOLANG_VERSION=1.11.1 +ARG GOLANG_VERSION=1.12.6 ENV GOROOT=/usr/local/go diff --git a/commit_tags.bsh b/commit_tags.bsh index d5dcc54..550cdb9 100755 --- a/commit_tags.bsh +++ b/commit_tags.bsh @@ -4,7 +4,7 @@ set -eu cd $(dirname "${BASH_SOURCE[0]}") -: ${GOLANG_VERSION:=1.11.1} +: ${GOLANG_VERSION:=1.12.6} export GOLANG_VERSION export DOCKER_LFS_BUILD_VERSION=${DOCKER_LFS_BUILD_VERSION:-release-2.1} diff --git a/debian_7.Dockerfile b/debian_7.Dockerfile index 4ef1340..6e5236d 100644 --- a/debian_7.Dockerfile +++ b/debian_7.Dockerfile @@ -9,7 +9,7 @@ RUN echo 'deb http://http.debian.net/debian wheezy-backports main' > /etc/apt/so RUN DEBIAN_FRONTEND=noninteractive apt-get -y update && \ apt-get install -y -t wheezy-backports git dpkg-dev dh-golang ruby-ronn curl -ARG GOLANG_VERSION=1.11.1 +ARG GOLANG_VERSION=1.12.6 ENV GOROOT=/usr/local/go diff --git a/debian_8.Dockerfile b/debian_8.Dockerfile index 6f55323..dae66d2 100644 --- a/debian_8.Dockerfile +++ b/debian_8.Dockerfile @@ -7,7 +7,7 @@ LABEL RUN="docker run -v git-lfs-checkout-dir:/src -v repo_dir:/repo" RUN DEBIAN_FRONTEND=noninteractive apt-get -y update && \ apt-get install -y git dpkg-dev dh-golang ruby-ronn curl -ARG GOLANG_VERSION=1.11.1 +ARG GOLANG_VERSION=1.12.6 ENV GOROOT=/usr/local/go diff --git a/debian_9.Dockerfile b/debian_9.Dockerfile index 970c626..4dc7ec2 100644 --- a/debian_9.Dockerfile +++ b/debian_9.Dockerfile @@ -7,7 +7,7 @@ LABEL RUN="docker run -v git-lfs-checkout-dir:/src -v repo_dir:/repo" RUN DEBIAN_FRONTEND=noninteractive apt-get -y update && \ apt-get install -y git dpkg-dev dh-golang ruby-ronn curl -ARG GOLANG_VERSION=1.11.1 +ARG GOLANG_VERSION=1.12.6 ENV GOROOT=/usr/local/go From 5e7bf33b5b2ce784d2060788912a55c448c021ee Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Thu, 27 Jun 2019 14:51:24 +0000 Subject: [PATCH 2/3] Remove Debian 7 Dockerfile Debian 7 is definitively end of life and apt can no longer fetch data for it. Since we can no longer build images for this version, remove the Dockerfile. --- debian_7.Dockerfile | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 debian_7.Dockerfile diff --git a/debian_7.Dockerfile b/debian_7.Dockerfile deleted file mode 100644 index 6e5236d..0000000 --- a/debian_7.Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM debian:wheezy -MAINTAINER Andy Neff - -#Docker RUN example, pass in the git-lfs checkout copy you are working with -LABEL RUN="docker run -v git-lfs-checkout-dir:/src -v repo_dir:/repo" - -RUN echo 'deb http://http.debian.net/debian wheezy-backports main' > /etc/apt/sources.list.d/wheezy-backports-main.list - -RUN DEBIAN_FRONTEND=noninteractive apt-get -y update && \ -apt-get install -y -t wheezy-backports git dpkg-dev dh-golang ruby-ronn curl - -ARG GOLANG_VERSION=1.12.6 - -ENV GOROOT=/usr/local/go - -RUN cd /usr/local && \ - curl -L -O https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz && \ - tar zxf go${GOLANG_VERSION}.linux-amd64.tar.gz && \ - ln -s /usr/local/go/bin/go /usr/bin/go && \ - ln -s /usr/local/go/bin/gofmt /usr/bin/gofmt - -COPY debian_script.bsh /tmp/ - -CMD /tmp/debian_script.bsh From 736cc86276734ef48a056053d9f5005c680e08ef Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Thu, 27 Jun 2019 14:35:17 +0000 Subject: [PATCH 3/3] Add a Dockerfile for Debian 10 Debian buster will be released soon, and we'll need to build packages for it. Add a Dockerfile for this target, which is functionally identical to the Debian 9 one except for the base image and the addition of the "ronn" package. --- debian_10.Dockerfile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 debian_10.Dockerfile diff --git a/debian_10.Dockerfile b/debian_10.Dockerfile new file mode 100644 index 0000000..6ace8e2 --- /dev/null +++ b/debian_10.Dockerfile @@ -0,0 +1,21 @@ +FROM debian:buster + +#Docker RUN example, pass in the git-lfs checkout copy you are working with +LABEL RUN="docker run -v git-lfs-checkout-dir:/src -v repo_dir:/repo" + +RUN DEBIAN_FRONTEND=noninteractive apt-get -y update && \ +apt-get install -y git dpkg-dev dh-golang ruby-ronn ronn curl + +ARG GOLANG_VERSION=1.12.6 + +ENV GOROOT=/usr/local/go + +RUN cd /usr/local && \ + curl -L -O https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz && \ + tar zxf go${GOLANG_VERSION}.linux-amd64.tar.gz && \ + ln -s /usr/local/go/bin/go /usr/bin/go && \ + ln -s /usr/local/go/bin/gofmt /usr/bin/gofmt + +COPY debian_script.bsh /tmp/ + +CMD /tmp/debian_script.bsh