Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add go to all Docker images except RPM/centos8 #749

Merged
merged 1 commit into from
Dec 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}/

Expand Down
2 changes: 1 addition & 1 deletion apk/Dockerfile-3.12
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 10 additions & 0 deletions deb/Dockerfile.stable-slim
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tasks/Makefile.package
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down