Skip to content

Commit 16186b8

Browse files
ldemaillyldemailly
authored
Go 1.22.8 and log 1.17.1 (#987)
1 parent d039ae7 commit 16186b8

11 files changed

+27
-27
lines changed

‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ defaultEnv:
88
&defaultEnv
99
docker:
1010
# specify the version
11-
- image: docker.io/fortio/fortio.build:v75@sha256:eb9a2c424c3e94c91e675a306f8ed2a088370e44788f4ec1ae646ceccb768fdc
11+
- image: docker.io/fortio/fortio.build:v76@sha256:252248e117d0d41fad25aa7c216e98ce516a2754d73f9241df537a2c8982b0c3
1212
working_directory: /build/fortio
1313

1414
jobs:

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the binaries in larger image
2-
FROM docker.io/fortio/fortio.build:v75@sha256:eb9a2c424c3e94c91e675a306f8ed2a088370e44788f4ec1ae646ceccb768fdc as build
2+
FROM docker.io/fortio/fortio.build:v76@sha256:252248e117d0d41fad25aa7c216e98ce516a2754d73f9241df537a2c8982b0c3 as build
33
WORKDIR /build
44
COPY --chown=build:build . fortio
55
ARG MODE=install

‎Dockerfile.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Dependencies and linters for build:
2-
FROM golang:1.22.7@sha256:192683db8982323952988c7b86c098ee7ecc6cbeb202bf7c113ff9be5358367c
2+
FROM golang:1.22.8@sha256:628529a29f130a8ab336b994be99d134ce98cd23b8f2052d8995678681e97ca2
33
# Need gcc for -race test (and some linters though those work with CGO_ENABLED=0)
44
RUN apt-get -y update && \
55
apt-get --no-install-recommends -y upgrade && \

‎Dockerfile.echosrv

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the binaries in larger image
2-
FROM docker.io/fortio/fortio.build:v75@sha256:eb9a2c424c3e94c91e675a306f8ed2a088370e44788f4ec1ae646ceccb768fdc as build
2+
FROM docker.io/fortio/fortio.build:v76@sha256:252248e117d0d41fad25aa7c216e98ce516a2754d73f9241df537a2c8982b0c3 as build
33
WORKDIR /build
44
COPY . fortio
55
RUN make -C fortio official-build-version BUILD_DIR=/build OFFICIAL_TARGET=fortio.org/fortio/echosrv

‎Dockerfile.fcurl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the binaries in larger image
2-
FROM docker.io/fortio/fortio.build:v75@sha256:eb9a2c424c3e94c91e675a306f8ed2a088370e44788f4ec1ae646ceccb768fdc as build
2+
FROM docker.io/fortio/fortio.build:v76@sha256:252248e117d0d41fad25aa7c216e98ce516a2754d73f9241df537a2c8982b0c3 as build
33
WORKDIR /build
44
COPY . fortio
55
RUN make -C fortio official-build-version BUILD_DIR=/build OFFICIAL_TARGET=fortio.org/fortio/fcurl

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
IMAGES=echosrv fcurl # plus the combo image / Dockerfile without ext.
88

99
DOCKER_PREFIX := docker.io/fortio/fortio
10-
BUILD_IMAGE_TAG := v75@sha256:eb9a2c424c3e94c91e675a306f8ed2a088370e44788f4ec1ae646ceccb768fdc
10+
BUILD_IMAGE_TAG := v76@sha256:252248e117d0d41fad25aa7c216e98ce516a2754d73f9241df537a2c8982b0c3
1111
BUILDX_PLATFORMS := linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
1212
BUILDX_POSTFIX :=
1313
ifeq '$(shell echo $(BUILDX_PLATFORMS) | awk -F "," "{print NF-1}")' '0'

‎README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- 1.67.0 -->
1+
<!-- 1.67.1 -->
22
# Fortio
33

44
[![Awesome Go](https://fortio.org/mentioned-badge.svg)](https://github.com/avelino/awesome-go#networking)
@@ -60,13 +60,13 @@ You can install from source:
6060
The [releases](https://github.com/fortio/fortio/releases) page has binaries for many OS/architecture combinations (see assets):
6161

6262
```shell
63-
curl -L https://github.com/fortio/fortio/releases/download/v1.67.0/fortio-linux_amd64-1.67.0.tgz \
63+
curl -L https://github.com/fortio/fortio/releases/download/v1.67.1/fortio-linux_amd64-1.67.1.tgz \
6464
| sudo tar -C / -xvzpf -
6565
# or the debian package
66-
wget https://github.com/fortio/fortio/releases/download/v1.67.0/fortio_1.67.0_amd64.deb
67-
dpkg -i fortio_1.67.0_amd64.deb
66+
wget https://github.com/fortio/fortio/releases/download/v1.67.1/fortio_1.67.1_amd64.deb
67+
dpkg -i fortio_1.67.1_amd64.deb
6868
# or the rpm
69-
rpm -i https://github.com/fortio/fortio/releases/download/v1.67.0/fortio-1.67.0-1.x86_64.rpm
69+
rpm -i https://github.com/fortio/fortio/releases/download/v1.67.1/fortio-1.67.1-1.x86_64.rpm
7070
# and more, see assets in release page
7171
```
7272

@@ -76,7 +76,7 @@ On macOS you can also install Fortio using [Homebrew](https://brew.sh/):
7676
brew install fortio
7777
```
7878

79-
On Windows, download https://github.com/fortio/fortio/releases/download/v1.67.0/fortio_win_1.67.0.zip and extract `fortio.exe` to any location, then using the Windows Command Prompt:
79+
On Windows, download https://github.com/fortio/fortio/releases/download/v1.67.1/fortio_win_1.67.1.zip and extract `fortio.exe` to any location, then using the Windows Command Prompt:
8080
```
8181
fortio.exe server
8282
```
@@ -130,7 +130,7 @@ Full list of command line flags (`fortio help`):
130130
<!-- use release/updateFlags.sh to update this section -->
131131
<pre>
132132
<!-- USAGE_START -->
133-
Φορτίο 1.67.0 usage:
133+
Φορτίο 1.67.1 usage:
134134
fortio command [flags] target
135135
where command is one of: load (load testing), server (starts ui, rest api,
136136
http-echo, redirect, proxies, tcp-echo, udp-echo and grpc ping servers),

‎Webtest.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ fi
140140
PPROF_URL="$BASE_URL/debug/pprof/heap?debug=1"
141141
$CURL "$PPROF_URL" | grep -i TotalAlloc # should find this in memory profile
142142
# creating dummy container to hold a volume for test certs due to remote docker bind mount limitation.
143-
DOCKERCURLID=$(docker run -d -v $TEST_CERT_VOL --net host --name $DOCKERSECVOLNAME docker.io/fortio/fortio.build:v75@sha256:eb9a2c424c3e94c91e675a306f8ed2a088370e44788f4ec1ae646ceccb768fdc sleep 120)
143+
DOCKERCURLID=$(docker run -d -v $TEST_CERT_VOL --net host --name $DOCKERSECVOLNAME docker.io/fortio/fortio.build:v76@sha256:252248e117d0d41fad25aa7c216e98ce516a2754d73f9241df537a2c8982b0c3 sleep 120)
144144
# while we have something with actual curl binary do
145145
# Test for h2c upgrade (#562)
146146
docker exec $DOCKERSECVOLNAME /usr/bin/curl -v --http2 -m 10 -d foo42 http://localhost:8080/debug | tee >(cat 1>&2) | grep foo42

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ go 1.21
1111

1212
require (
1313
fortio.org/assert v1.2.1
14-
fortio.org/cli v1.9.0
15-
fortio.org/dflag v1.7.2
16-
fortio.org/log v1.16.0
14+
fortio.org/cli v1.9.2
15+
fortio.org/dflag v1.7.3
16+
fortio.org/log v1.17.1
1717
fortio.org/safecast v1.0.0
18-
fortio.org/scli v1.15.2
18+
fortio.org/scli v1.15.3
1919
fortio.org/sets v1.2.0
2020
fortio.org/testscript v0.3.2
2121
fortio.org/version v1.0.4

‎go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
fortio.org/assert v1.2.1 h1:48I39urpeDj65RP1KguF7akCjILNeu6vICiYMEysR7Q=
22
fortio.org/assert v1.2.1/go.mod h1:039mG+/iYDPO8Ibx8TrNuJCm2T2SuhwRI3uL9nHTTls=
3-
fortio.org/cli v1.9.0 h1:cPgNHvrjxznmbmwuXSwPqQLKZ+RMW8i0iAOESLjt1aI=
4-
fortio.org/cli v1.9.0/go.mod h1:pk/JBE8LcXtNuo5Yj2bLsVbwPaHo8NWdbstSN0cpbFk=
5-
fortio.org/dflag v1.7.2 h1:lUhXFvDlw4CJj/q7hPv/TC+n/wVoQylzQO6bUg5GQa0=
6-
fortio.org/dflag v1.7.2/go.mod h1:6yO/NIgrWfQH195WbHJ3Y45SCx11ffivQjfx2C/FS1U=
7-
fortio.org/log v1.16.0 h1:GhU8/9NkYZmEIzvTN/DTMedDAStLJraWUUVUA2EbNDc=
8-
fortio.org/log v1.16.0/go.mod h1:t58Spg9njjymvRioh5F6qKGSupEsnMjXLGWIS1i3khE=
3+
fortio.org/cli v1.9.2 h1:17eJ8QZPjXHcLBpeCe0QMO/0fj5Bw0ZTxVgL7V9jOqc=
4+
fortio.org/cli v1.9.2/go.mod h1:7r55OoTV8NXcTvJT4boWk8s3I2LP6TMZh/0LLMJEYw0=
5+
fortio.org/dflag v1.7.3 h1:yws+v+/fJ67bYgrgcWpLtgdZPEWkYuwdfqz/WyQ8UXo=
6+
fortio.org/dflag v1.7.3/go.mod h1:O1Pk4lKRolw9wwAGyjTo8IsNyqqNRQGKxPOfpOElMqM=
7+
fortio.org/log v1.17.1 h1:YQoGyZBnXTVIs77/nZw7BppwSOIamP3I092PGBenBZs=
8+
fortio.org/log v1.17.1/go.mod h1:t58Spg9njjymvRioh5F6qKGSupEsnMjXLGWIS1i3khE=
99
fortio.org/safecast v1.0.0 h1:dr3131WPX8iS1pTf76+39WeXbTrerDYLvi9s7Oi3wiY=
1010
fortio.org/safecast v1.0.0/go.mod h1:xZmcPk3vi4kuUFf+tq4SvnlVdwViqf6ZSZl91Jr9Jdg=
11-
fortio.org/scli v1.15.2 h1:vWXt4QOViXNWy4Gdm7d2FDfptzWD00QiWzYAM/IUF7c=
12-
fortio.org/scli v1.15.2/go.mod h1:XvY2JglgCeeZOIc5CrfBTtcsxkVV8xmGL5ykAcBjEHI=
11+
fortio.org/scli v1.15.3 h1:XZYONPupGOd1Q68G4aq0vWg9obw0M57sC4snkyiab9w=
12+
fortio.org/scli v1.15.3/go.mod h1:cWJJbXObkF+GsbtPqxE60GFctllOANYS+Yp9PJK0xK8=
1313
fortio.org/sets v1.2.0 h1:FBfC7R2xrOJtkcioUbY6WqEzdujuBoZRbSdp1fYF4Kk=
1414
fortio.org/sets v1.2.0/go.mod h1:J2BwIxNOLWsSU7IMZUg541kh3Au4JEKHrghVwXs68tE=
1515
fortio.org/struct2env v0.4.1 h1:rJludAMO5eBvpWplWEQNqoVDFZr4RWMQX7RUapgZyc0=

‎release/Dockerfile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Concatenated after ../Dockerfile to create the tgz
2-
FROM docker.io/fortio/fortio.build:v75@sha256:eb9a2c424c3e94c91e675a306f8ed2a088370e44788f4ec1ae646ceccb768fdc as stage
2+
FROM docker.io/fortio/fortio.build:v76@sha256:252248e117d0d41fad25aa7c216e98ce516a2754d73f9241df537a2c8982b0c3 as stage
33
ARG archs="amd64 arm64 ppc64le s390x"
44
ENV archs=${archs}
55
# Build image defaults to build user, switch back to root for

0 commit comments

Comments
 (0)