Skip to content

Commit

Permalink
Update language and tools in Dockerfile
Browse files Browse the repository at this point in the history
- go 1.18.3 to 1.18.5
- ko to 0.12.0
- kustomize to 4.5.7
- some alpine and kubectl bumps

Signed-off-by: Vincent Demeester <[email protected]>
  • Loading branch information
vdemeester authored and tekton-robot committed Aug 30, 2022
1 parent fe5dd9c commit 57f4788
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions tekton/images/coverage/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.18.3 as buildcoverage
FROM golang:1.18.5 as buildcoverage
RUN git clone https://github.com/knative/test-infra /go/src/knative.dev/test-infra
RUN git -C /go/src/knative.dev/test-infra checkout ba4c2c3e061a59ac4b167da84924e9fa55475ad9 # Last commit before removal of tools/coverage
RUN make -C /go/src/knative.dev/test-infra/tools/coverage

FROM golang:1.18.3
FROM golang:1.18.5
LABEL maintainer "Tekton Authors <[email protected]>"

RUN apt-get update && apt-get install -y --no-install-recommends \
Expand Down
4 changes: 2 additions & 2 deletions tekton/images/kind-e2e/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@

# Runtime image for common dependencies when running kind tests.

FROM golang:1.18.3-alpine
FROM golang:1.18.5-alpine
LABEL maintainer "Tekton Authors <[email protected]>"

WORKDIR /kind

RUN GO111MODULE=on go install github.com/google/ko@v0.11.2
RUN GO111MODULE=on go install github.com/google/ko@v0.12.0

# common util tools
RUN apk add --no-cache \
Expand Down
4 changes: 2 additions & 2 deletions tekton/images/kind/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

# Runtime image for common dependencies when running kind tests.

FROM golang:1.18.3-alpine
FROM golang:1.18.5-alpine

WORKDIR /kind

RUN GO111MODULE=on go install github.com/google/ko@v0.11.2
RUN GO111MODULE=on go install github.com/google/ko@v0.12.0

RUN apk add --no-cache \
bash curl docker git jq openssl
Expand Down
8 changes: 4 additions & 4 deletions tekton/images/ko-gcloud/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
ARG GO_VERSION=1.18.3
ARG GO_VERSION=1.18.5
FROM golang:${GO_VERSION}-alpine3.15 as build
LABEL description="Build container"

RUN apk update && apk add --no-cache alpine-sdk ca-certificates
RUN update-ca-certificates

ARG KUBECTL_VERSION=1.21.10
ARG KUBECTL_VERSION=1.22.13
RUN wget -O/usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v$KUBECTL_VERSION/bin/linux/amd64/kubectl; chmod +x /usr/local/bin/kubectl

# Install Kustomize
ENV GOBIN=/usr/local/go/bin
ENV GO111MODULE on
RUN go install sigs.k8s.io/kustomize/kustomize/[email protected].4
RUN go install sigs.k8s.io/kustomize/kustomize/[email protected].7

# Install yq for YAML parsing
RUN apk add --no-cache yq
Expand All @@ -40,7 +40,7 @@ ENV PATH="${PATH}:/usr/local/go/bin"
ENV GOROOT /usr/local/go

# Install ko
ARG KO_VERSION=0.11.2
ARG KO_VERSION=0.12.0
RUN curl -L https://github.com/google/ko/releases/download/v${KO_VERSION}/ko_${KO_VERSION}_Linux_x86_64.tar.gz > ko_${KO_VERSION}.tar.gz
RUN tar -C /usr/local/bin -xzf ko_${KO_VERSION}.tar.gz

Expand Down
6 changes: 3 additions & 3 deletions tekton/images/ko/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM golang:1.18.3-alpine3.15
FROM golang:1.18.5-alpine3.15
LABEL maintainer "Tekton Authors <[email protected]>"

ENV GOROOT /usr/local/go
RUN apk add --no-cache curl ca-certificates
RUN update-ca-certificates

ARG KO_VERSION=0.11.2
ARG KO_VERSION=0.12.0
RUN curl -L https://github.com/google/ko/releases/download/v${KO_VERSION}/ko_${KO_VERSION}_Linux_x86_64.tar.gz > ko_${KO_VERSION}.tar.gz
RUN tar -C /usr/local/bin -xzf ko_${KO_VERSION}.tar.gz

RUN apk add --no-cache musl-dev gcc git
ENV GO111MODULE on
RUN go install sigs.k8s.io/kustomize/kustomize/[email protected].4
RUN go install sigs.k8s.io/kustomize/kustomize/[email protected].7
8 changes: 4 additions & 4 deletions tekton/images/test-runner/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# Build kubetest independently of the rest
FROM docker.io/library/golang:1.18.3 as kubetest
FROM docker.io/library/golang:1.18.5 as kubetest
RUN git clone https://github.com/kubernetes/test-infra /go/src/k8s.io/test-infra
# Using e685556b32c5fb7ab12c3277d41112d47ceac0cd because after that, the URL kubetest
# uses needs extract credentials.
Expand Down Expand Up @@ -149,7 +149,7 @@ RUN ["/bin/chmod", "+x", "/workspace/get-kube.sh"]
# END: test-infra import

# Install Go 1.18.3
ARG GO_VERSION=1.18.3
ARG GO_VERSION=1.18.5
RUN curl https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz > go${GO_VERSION}.tar.gz && \
tar -C /usr/local -xzf go${GO_VERSION}.tar.gz && \
rm go${GO_VERSION}.tar.gz
Expand All @@ -160,7 +160,7 @@ RUN apt update && apt install -y uuid-runtime # for uuidgen
RUN apt update && apt install -y rubygems # for mdl

# Install ko
ARG KO_VERSION=0.8.3
ARG KO_VERSION=0.12.0
RUN curl -L https://github.com/google/ko/releases/download/v${KO_VERSION}/ko_${KO_VERSION}_Linux_x86_64.tar.gz > ko_${KO_VERSION}.tar.gz
RUN tar -C /usr/local/bin -xzf ko_${KO_VERSION}.tar.gz

Expand All @@ -177,7 +177,7 @@ ARG GOLANGCI_VERSION=1.47.2
RUN curl -sL https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCI_VERSION}/golangci-lint-${GOLANGCI_VERSION}-linux-amd64.tar.gz | tar -C /usr/local/bin -xvzf - --strip-components=1 --wildcards "*/golangci-lint"

# Install Kustomize:
ARG KUSTOMIZE_VERSION=3.8.1
ARG KUSTOMIZE_VERSION=4.5.7
RUN curl -sL https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz | tar -C /usr/local/bin -xvzf - --strip-components=1 --wildcards "kustomize"

# Install the TektonCD CLI: https://github.com/tektoncd/cli/
Expand Down
2 changes: 1 addition & 1 deletion tekton/images/tkn/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM alpine:3.11
FROM alpine:3.15
LABEL maintainer "Tekton Authors <[email protected]>"

ARG TKN_VERSION=0.25.0
Expand Down

0 comments on commit 57f4788

Please sign in to comment.