DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #10740 from strongjz/alpine-319

Browse source 
upgrade alpine to 3.19.0 ginko to 2.13.1
This commit is contained in:
James Strong 2023-12-08 15:52:14 -05:00 committed by GitHub
commit 4c39e6accc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/run-in-docker.sh
View file

@ -87,7 +87,7 @@ if [[ "$DOCKER_IN_DOCKER_ENABLED" == "true" ]]; then
echo "..reached DIND check TRUE block, inside run-in-docker.sh" echo "..reached DIND check TRUE block, inside run-in-docker.sh"
echo "FLAGS=$FLAGS" echo "FLAGS=$FLAGS"
#go env #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 find / -type f -name ginkgo 2>/dev/null
which ginkgo which ginkgo
/bin/bash -c "${FLAGS}" /bin/bash -c "${FLAGS}"

2
images/cfssl/rootfs/Dockerfile
View file

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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 RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories

4
images/nginx/rootfs/Dockerfile
View file

@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM alpine:3.18.5 as builder FROM alpine:3.19.0 as builder
COPY . / COPY . /
@ -21,7 +21,7 @@ RUN apk update \
&& /build.sh && /build.sh
# Use a multi-stage build # 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 ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin

2
images/opentelemetry/rootfs/Dockerfile
View file

@ -13,7 +13,7 @@
# limitations under the License. # 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 RUN mkdir -p /opt/third_party/install
COPY . /opt/third_party/ COPY . /opt/third_party/

4
images/test-runner/Makefile
View file

@ -54,7 +54,7 @@ image:
--build-arg YAML_LINT_VERSION=1.27.1 \ --build-arg YAML_LINT_VERSION=1.27.1 \
--build-arg YAMALE_VERSION=4.0.4 \ --build-arg YAMALE_VERSION=4.0.4 \
--build-arg HELM_VERSION=3.11.2 \ --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 \ --build-arg GOLINT_VERSION=latest \
-t ${IMAGE}:${TAG} rootfs -t ${IMAGE}:${TAG} rootfs
@ -75,7 +75,7 @@ build: ensure-buildx
--build-arg YAML_LINT_VERSION=1.27.1 \ --build-arg YAML_LINT_VERSION=1.27.1 \
--build-arg YAMALE_VERSION=4.0.4 \ --build-arg YAMALE_VERSION=4.0.4 \
--build-arg HELM_VERSION=3.11.2 \ --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 \ --build-arg GOLINT_VERSION=latest \
-t ${IMAGE}:${TAG} rootfs -t ${IMAGE}:${TAG} rootfs

2
rootfs/Dockerfile-chroot
View file

@ -23,7 +23,7 @@ RUN apk update \
&& apk upgrade \ && apk upgrade \
&& /chroot.sh && /chroot.sh
FROM alpine:3.18.5 FROM alpine:3.19.0
ARG TARGETARCH ARG TARGETARCH
ARG VERSION ARG VERSION

2
test/e2e-image/Dockerfile
View file

@ -1,7 +1,7 @@
ARG E2E_BASE_IMAGE ARG E2E_BASE_IMAGE
FROM ${E2E_BASE_IMAGE} AS BASE FROM ${E2E_BASE_IMAGE} AS BASE
FROM alpine:3.18.5 FROM alpine:3.19.0
RUN apk update \ RUN apk update \
&& apk upgrade && apk add -U --no-cache \ && apk upgrade && apk add -U --no-cache \

2
test/e2e/run-chart-test.sh
View file

@ -78,7 +78,7 @@ fi
if [ "${SKIP_IMAGE_CREATION:-false}" = "false" ]; then if [ "${SKIP_IMAGE_CREATION:-false}" = "false" ]; then
if ! command -v ginkgo &> /dev/null; 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 fi
echo "[dev-env] building image" echo "[dev-env] building image"
make -C ${DIR}/../../ clean-image build image make -C ${DIR}/../../ clean-image build image

2
test/e2e/run-kind-e2e.sh
View file

@ -96,7 +96,7 @@ fi
if [ "${SKIP_E2E_IMAGE_CREATION}" = "false" ]; then if [ "${SKIP_E2E_IMAGE_CREATION}" = "false" ]; then
if ! command -v ginkgo &> /dev/null; 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 fi
echo "[dev-env] .. done building controller images" echo "[dev-env] .. done building controller images"