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.

Sign up for GitHub

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

also bump go version for cross-build container #1565

Merged
merged 1 commit into from
Dec 7, 2023
Merged

also bump go version for cross-build container #1565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 dist/docker-images/cross-build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM debian:bullseye-slim
#

ARG TARGETARCH
ARG golang_version=1.19.5
ARG golang_version=1.21.5
ARG go_distribution_file=go${golang_version}.linux-${TARGETARCH}.tar.gz
ARG go_path=/usr/share/go
ARG go_root=/usr/local/go
Expand Down
4 changes: 1 addition & 3 deletions dist/docker-images/cross-build/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ This article supports local development by providing a local containerized metho
You only need to build the container image once unless you change the Dockerfile or `./linux-build.sh` (the container's entrypoint).

```bash
# build a container image named "ziti-go-builder" with the same version of Go that's declared in go.mod
# build a container image named "ziti-go-builder"
docker buildx build \
--tag=ziti-go-builder \
--build-arg uid=$UID \
--build-arg gid=$GID \
--build-arg golang_version=$(grep -Po '^go\s+\K\d+\.\d+(\.\d+)?$' go.mod) \
--load \
./docker-images/cross-build/
```
Expand Down Expand Up @@ -56,7 +55,6 @@ You will find the built artifacts in `./release`.
--tag=ziti-go-builder \
--build-arg uid=$UID \
--build-arg gid=$GID \
--build-arg golang_version="$(/bin/grep -Po '^go\s+\K\d+\.\d+(\.\d+)?$' go.mod)" \
--load \
./docker-images/cross-build/

Expand Down
Loading