Merge pull request #10740 from strongjz/alpine-319
upgrade alpine to 3.19.0 ginko to 2.13.1
This commit is contained in:
commit
4c39e6accc
9 changed files with 11 additions and 11 deletions
|
@ -87,7 +87,7 @@ if [[ "$DOCKER_IN_DOCKER_ENABLED" == "true" ]]; then
|
|||
echo "..reached DIND check TRUE block, inside run-in-docker.sh"
|
||||
echo "FLAGS=$FLAGS"
|
||||
#go env
|
||||
go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.13.0
|
||||
go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.13.1
|
||||
find / -type f -name ginkgo 2>/dev/null
|
||||
which ginkgo
|
||||
/bin/bash -c "${FLAGS}"
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
FROM alpine:3.18.5
|
||||
FROM alpine:3.19.0
|
||||
|
||||
|
||||
RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
|
||||
|
|
|
@ -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.18.5 as builder
|
||||
FROM alpine:3.19.0 as builder
|
||||
|
||||
COPY . /
|
||||
|
||||
|
@ -21,7 +21,7 @@ RUN apk update \
|
|||
&& /build.sh
|
||||
|
||||
# Use a multi-stage build
|
||||
FROM alpine:3.18.5
|
||||
FROM alpine:3.19.0
|
||||
|
||||
ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
# limitations under the License.
|
||||
|
||||
|
||||
FROM alpine:3.18.5 as base
|
||||
FROM alpine:3.19.0 as base
|
||||
|
||||
RUN mkdir -p /opt/third_party/install
|
||||
COPY . /opt/third_party/
|
||||
|
|
|
@ -54,7 +54,7 @@ image:
|
|||
--build-arg YAML_LINT_VERSION=1.27.1 \
|
||||
--build-arg YAMALE_VERSION=4.0.4 \
|
||||
--build-arg HELM_VERSION=3.11.2 \
|
||||
--build-arg GINKGO_VERSION=2.13.0 \
|
||||
--build-arg GINKGO_VERSION=2.13.1 \
|
||||
--build-arg GOLINT_VERSION=latest \
|
||||
-t ${IMAGE}:${TAG} rootfs
|
||||
|
||||
|
@ -75,7 +75,7 @@ build: ensure-buildx
|
|||
--build-arg YAML_LINT_VERSION=1.27.1 \
|
||||
--build-arg YAMALE_VERSION=4.0.4 \
|
||||
--build-arg HELM_VERSION=3.11.2 \
|
||||
--build-arg GINKGO_VERSION=2.13.0 \
|
||||
--build-arg GINKGO_VERSION=2.13.1 \
|
||||
--build-arg GOLINT_VERSION=latest \
|
||||
-t ${IMAGE}:${TAG} rootfs
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ RUN apk update \
|
|||
&& apk upgrade \
|
||||
&& /chroot.sh
|
||||
|
||||
FROM alpine:3.18.5
|
||||
FROM alpine:3.19.0
|
||||
|
||||
ARG TARGETARCH
|
||||
ARG VERSION
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
ARG E2E_BASE_IMAGE
|
||||
FROM ${E2E_BASE_IMAGE} AS BASE
|
||||
|
||||
FROM alpine:3.18.5
|
||||
FROM alpine:3.19.0
|
||||
|
||||
RUN apk update \
|
||||
&& apk upgrade && apk add -U --no-cache \
|
||||
|
|
|
@ -78,7 +78,7 @@ fi
|
|||
|
||||
if [ "${SKIP_IMAGE_CREATION:-false}" = "false" ]; then
|
||||
if ! command -v ginkgo &> /dev/null; then
|
||||
go install github.com/onsi/ginkgo/v2/ginkgo@v2.13.0
|
||||
go install github.com/onsi/ginkgo/v2/ginkgo@v2.13.1
|
||||
fi
|
||||
echo "[dev-env] building image"
|
||||
make -C ${DIR}/../../ clean-image build image
|
||||
|
|
|
@ -96,7 +96,7 @@ fi
|
|||
|
||||
if [ "${SKIP_E2E_IMAGE_CREATION}" = "false" ]; then
|
||||
if ! command -v ginkgo &> /dev/null; then
|
||||
go install github.com/onsi/ginkgo/v2/ginkgo@v2.13.0
|
||||
go install github.com/onsi/ginkgo/v2/ginkgo@v2.13.1
|
||||
fi
|
||||
|
||||
echo "[dev-env] .. done building controller images"
|
||||
|
|
Loading…
Reference in a new issue