-
Notifications
You must be signed in to change notification settings - Fork 164
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #337 from macedogm/v2.7-security-improvements
Bump Go and Dockerfile versions
- Loading branch information
Showing
6 changed files
with
83 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,15 @@ | ||
| FROM golang:1.16 | ||
| RUN apt-get update && \ | ||
| apt-get install -y xz-utils zip rsync | ||
| FROM registry.suse.com/bci/golang:1.19 | ||
|
|
||
| RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.46.2; | ||
| RUN zypper -n install docker | ||
|
|
||
| ENV GOLANGCI_LINT v1.53.3 | ||
| RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin "$GOLANGCI_LINT" | ||
|
|
||
| ENV DOCKER_VERSION=20.10.5 | ||
|
|
||
| RUN curl -sL https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz -o docker-${DOCKER_VERSION}.tgz && \ | ||
| tar -zxvf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker --strip-components 1 && \ | ||
| chmod +x /usr/bin/docker | ||
|
|
||
| ENV PATH /go/bin:$PATH | ||
| ENV DAPPER_SOURCE /go/src/github.com/rancher/cli | ||
| ENV DAPPER_OUTPUT bin build/bin dist | ||
| ENV DAPPER_DOCKER_SOCKET true | ||
| ENV DAPPER_ENV TAG REPO GOOS CROSS DRONE_TAG | ||
|
|
||
| WORKDIR ${DAPPER_SOURCE} | ||
| ENTRYPOINT ["./scripts/entry"] | ||
| CMD ["ci"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,21 @@ | ||
| FROM alpine:3.13 | ||
| RUN apk add --no-cache ca-certificates openssh-client | ||
| FROM registry.suse.com/bci/bci-base:15.5 | ||
|
|
||
| ARG user=cli | ||
|
|
||
| RUN zypper -n update && \ | ||
| zypper -n install ca-certificates openssh-clients && \ | ||
| zypper clean -a && rm -rf /tmp/* /var/tmp/* /usr/share/doc/packages/* /usr/share/doc/manual/* /var/log/* | ||
|
|
||
| RUN echo "$user:x:1000:1000::/home/$user:/bin/bash" >> /etc/passwd && \ | ||
| echo "$user:x:1000:" >> /etc/group && \ | ||
| mkdir /home/$user && \ | ||
| chown -R $user:$user /home/$user | ||
|
|
||
| COPY rancher /usr/bin/ | ||
| WORKDIR /mnt | ||
|
|
||
| WORKDIR /home/$user | ||
|
|
||
| USER 1000:1000 | ||
|
|
||
| ENTRYPOINT ["rancher"] | ||
| CMD ["--help"] |