diff --git a/Dockerfile b/Dockerfile index 7d5deee8e9..f615ee9569 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ FROM alpine:3.12 ENV INSTALL_PATH=/packages/bin ENV PATH=${INSTALL_PATH}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin RUN mkdir -p ${INSTALL_PATH} -RUN apk add --update --no-cache bash make curl coreutils libc6-compat tar xz jq +RUN apk add --update --no-cache bash make curl coreutils libc6-compat tar xz jq sudo go COPY --from=cfssl /go/bin/ ${INSTALL_PATH}/ diff --git a/apk/Dockerfile-3.12 b/apk/Dockerfile-3.12 index 25a6f97694..7d87413c3b 100644 --- a/apk/Dockerfile-3.12 +++ b/apk/Dockerfile-3.12 @@ -10,6 +10,6 @@ RUN echo "https://alpine.global.ssl.fastly.net/alpine/edge/testing" >> /etc/apk/ RUN echo "https://alpine.global.ssl.fastly.net/alpine/edge/community" >> /etc/apk/repositories RUN apk update && \ - apk add make curl alpine-sdk shadow bash jq sudo + apk add make curl alpine-sdk shadow bash jq sudo go RUN echo "auth sufficient pam_shells.so" > /etc/pam.d/chsh diff --git a/deb/Dockerfile.stable-slim b/deb/Dockerfile.stable-slim index de5d206071..c419676bd2 100644 --- a/deb/Dockerfile.stable-slim +++ b/deb/Dockerfile.stable-slim @@ -9,4 +9,14 @@ RUN apt-get update && \ RUN gem install --no-document backports -v 3.15.0 RUN gem install --no-document fpm +ARG GO_INSTALL_VERSION=1.15.6 + +# Install go +RUN echo downloading go${GO_INSTALL_VERSION} && \ + curl -sSL --retry 3 -o golang.tar.gz https://golang.org/dl/go${GO_INSTALL_VERSION}.linux-amd64.tar.gz && \ + tar xzf golang.tar.gz && \ + mv go /usr/lib/ && rm golang.tar.gz && \ + ln -s /usr/lib/go/bin/go /usr/bin/go + + WORKDIR /packages diff --git a/tasks/Makefile.package b/tasks/Makefile.package index 165c1e1c4d..b0e22722e2 100644 --- a/tasks/Makefile.package +++ b/tasks/Makefile.package @@ -124,7 +124,7 @@ RELEASE: VERSION LICENSE DESCRIPTION fi init: AUTO_UPDATE_ENABLED=true -init: $(PACKAGE_VERSION_TARGET) LICENSE DESCRIPTION RELEASE +init: LICENSE DESCRIPTION $(PACKAGE_VERSION_TARGET) RELEASE update: $(PACKAGE_VERSION_TARGET) RELEASE