-
Notifications
You must be signed in to change notification settings - Fork 7
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 #315 from uselagoon/update-vers
build: update golang to 1.22
- Loading branch information
Showing
11 changed files
with
167 additions
and
184 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 |
|---|---|---|
|
|
@@ -18,7 +18,7 @@ jobs: | |
| strategy: | ||
| matrix: | ||
| goversion: | ||
| - 1.21 | ||
| - 1.22 | ||
| steps: | ||
| - | ||
| name: Checkout PR | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ jobs: | |
| strategy: | ||
| matrix: | ||
| goversion: | ||
| - 1.21 | ||
| - 1.22 | ||
| steps: | ||
| - | ||
| name: Checkout Branch or Tag | ||
|
|
||
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,8 +1,8 @@ | ||
| ARG UPSTREAM_REPO | ||
| ARG UPSTREAM_TAG | ||
| ARG GO_VER | ||
| FROM ${UPSTREAM_REPO:-uselagoon}/commons:${UPSTREAM_TAG:-latest} as commons | ||
| FROM golang:${GO_VER:-1.21}-alpine3.18 as golang | ||
| FROM ${UPSTREAM_REPO:-uselagoon}/commons:${UPSTREAM_TAG:-latest} AS commons | ||
| FROM golang:${GO_VER:-1.22}-alpine3.20 AS golang | ||
|
|
||
| RUN apk add --no-cache git | ||
| RUN go install github.com/a8m/envsubst/cmd/[email protected] | ||
|
|
@@ -38,7 +38,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ | |
| FROM docker:20.10.24 | ||
|
|
||
| LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" | ||
| LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" | ||
| LABEL org.opencontainers.image.source="https://github.com/uselagoon/build-deploy-tool" repository="https://github.com/uselagoon/build-deploy-tool" | ||
|
|
||
| ENV LAGOON=build-deploy-image | ||
|
|
||
|
|
@@ -65,14 +65,14 @@ ENV TMPDIR=/tmp \ | |
| BASH_ENV=/home/.bashrc | ||
|
|
||
| # Defining Versions | ||
| ENV KUBECTL_VERSION=v1.27.6 \ | ||
| HELM_VERSION=v3.13.0 | ||
| ENV KUBECTL_VERSION=v1.30.3 \ | ||
| HELM_VERSION=v3.15.3 | ||
|
|
||
| RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing aufs-util \ | ||
| && apk upgrade --no-cache openssh openssh-keygen openssh-client-common openssh-client-default \ | ||
| && apk add --no-cache openssl curl jq parallel bash git py-pip skopeo \ | ||
| && git config --global user.email "[email protected]" && git config --global user.name lagoon \ | ||
| && pip install shyaml yq | ||
| && pip install --break-system-packages shyaml yq | ||
|
|
||
| RUN architecture=$(case $(uname -m) in x86_64 | amd64) echo "amd64" ;; aarch64 | arm64 | armv8) echo "arm64" ;; *) echo "amd64" ;; esac) \ | ||
| && curl -Lo /usr/bin/kubectl https://dl.k8s.io/release/$KUBECTL_VERSION/bin/linux/${architecture}/kubectl \ | ||
|
|
@@ -108,8 +108,6 @@ RUN architecture=$(case $(uname -m) in x86_64 | amd64) echo "amd64" ;; aarch64 | | |
| && curl -sSL https://github.com/uselagoon/lagoon-linter/releases/download/v0.8.0/lagoon-linter_0.8.0_linux_${architecture}.tar.gz \ | ||
| | tar -xz -C /usr/local/bin lagoon-linter | ||
|
|
||
| # RUN curl -sSL https://github.com/uselagoon/build-deploy-tool/releases/download/v0.11.0/build-deploy-tool_0.11.0_linux_amd64.tar.gz \ | ||
| # | tar -xz -C /usr/local/bin build-deploy-tool | ||
| COPY --from=golang /app/build-deploy-tool /usr/local/bin/build-deploy-tool | ||
|
|
||
| # enable running unprivileged | ||
|
|
||
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
Oops, something went wrong.