From a36cf45beb308160522715d401b5370bb3489597 Mon Sep 17 00:00:00 2001 From: Niccolo Raspa <6024049+niccoloraspa@users.noreply.github.com> Date: Tue, 11 Apr 2023 18:38:10 +0200 Subject: [PATCH] [chores] Update alpine docker base image to alpine:3.17 (#4893) * Update alpine base image to 3.17 * Update .dockerignore * Update CHANGELOG.md --- .dockerignore | 2 +- .github/workflows/push-dev-docker-images.yml | 2 +- .github/workflows/push-docker-images.yml | 4 ++-- CHANGELOG.md | 1 + Makefile | 6 +++--- tests/localosmosis/README.md | 2 +- tests/localosmosis/docker-compose.yml | 2 +- tests/localosmosis/state_export/docker-compose.yml | 2 +- tests/localrelayer/docker-compose.yml | 4 ++-- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.dockerignore b/.dockerignore index 14ef7bb1715..2ddc8efa6a5 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,7 +5,7 @@ networks/ proto/ scripts/ tools/ -tests/cl-go-client +tests/ .github/ .git/ .vscode/ diff --git a/.github/workflows/push-dev-docker-images.yml b/.github/workflows/push-dev-docker-images.yml index b7a26245881..4211f62c2d5 100644 --- a/.github/workflows/push-dev-docker-images.yml +++ b/.github/workflows/push-dev-docker-images.yml @@ -23,7 +23,7 @@ on: - v[0-9]+.x env: - RUNNER_BASE_IMAGE_ALPINE: alpine:3.16 + RUNNER_BASE_IMAGE_ALPINE: alpine:3.17 OSMOSIS_DEV_IMAGE_REPOSITORY: osmolabs/osmosis-dev OSMOSIS_INIT_CHAIN_IMAGE_REPOSITORY: osmolabs/osmosis-e2e-init-chain diff --git a/.github/workflows/push-docker-images.yml b/.github/workflows/push-docker-images.yml index f365154184b..acd6705c91f 100644 --- a/.github/workflows/push-docker-images.yml +++ b/.github/workflows/push-docker-images.yml @@ -17,7 +17,7 @@ # - `osmolabs/osmosis:X.Y.Z` uses `gcr.io/distroless/static-debian11` # - `osmolabs/osmosis:X.Y.Z-distroless` uses `gcr.io/distroless/static-debian11` # - `osmolabs/osmosis:X.Y.Z-nonroot` uses `gcr.io/distroless/static-debian11:nonroot` -# - `osmolabs/osmosis:X.Y.Z-alpine` uses `alpine:3.16` +# - `osmolabs/osmosis:X.Y.Z-alpine` uses `alpine:3.17` # # All the images above have support for linux/amd64 and linux/arm64. # @@ -35,7 +35,7 @@ env: DOCKER_REPOSITORY: osmolabs/osmosis RUNNER_BASE_IMAGE_DISTROLESS: gcr.io/distroless/static-debian11 RUNNER_BASE_IMAGE_NONROOT: gcr.io/distroless/static-debian11:nonroot - RUNNER_BASE_IMAGE_ALPINE: alpine:3.16 + RUNNER_BASE_IMAGE_ALPINE: alpine:3.17 jobs: osmosisd-images: diff --git a/CHANGELOG.md b/CHANGELOG.md index 9afe43a46e0..edaaa014dc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * [#4549](https://github.com/osmosis-labs/osmosis/pull/4549) Add single pool price estimate queries * [#4767](https://github.com/osmosis-labs/osmosis/pull/4767) Disable create pool with non-zero exit fee * [#4847](https://github.com/osmosis-labs/osmosis/pull/4847) Update `make build` command to build only `osmosisd` binary + * [#4893](https://github.com/osmosis-labs/osmosis/pull/4893) Update alpine docker base image to `alpine:3.17` ### API Breaks diff --git a/Makefile b/Makefile index 3685c481579..0d2eb48e90f 100644 --- a/Makefile +++ b/Makefile @@ -119,7 +119,7 @@ build-reproducible-amd64: go.sum $(BUILDDIR)/ --build-arg GO_VERSION=$(GO_VERSION) \ --build-arg GIT_VERSION=$(VERSION) \ --build-arg GIT_COMMIT=$(COMMIT) \ - --build-arg RUNNER_IMAGE=alpine:3.16 \ + --build-arg RUNNER_IMAGE=alpine:3.17 \ --platform linux/amd64 \ -t osmosis:local-amd64 \ --load \ @@ -136,7 +136,7 @@ build-reproducible-arm64: go.sum $(BUILDDIR)/ --build-arg GO_VERSION=$(GO_VERSION) \ --build-arg GIT_VERSION=$(VERSION) \ --build-arg GIT_COMMIT=$(COMMIT) \ - --build-arg RUNNER_IMAGE=alpine:3.16 \ + --build-arg RUNNER_IMAGE=alpine:3.17 \ --platform linux/arm64 \ -t osmosis:local-arm64 \ --load \ @@ -331,7 +331,7 @@ e2e-remove-resources: ############################################################################### RUNNER_BASE_IMAGE_DISTROLESS := gcr.io/distroless/static-debian11 -RUNNER_BASE_IMAGE_ALPINE := alpine:3.16 +RUNNER_BASE_IMAGE_ALPINE := alpine:3.17 RUNNER_BASE_IMAGE_NONROOT := gcr.io/distroless/static-debian11:nonroot docker-build: diff --git a/tests/localosmosis/README.md b/tests/localosmosis/README.md index 3ac70675969..31461acd815 100644 --- a/tests/localosmosis/README.md +++ b/tests/localosmosis/README.md @@ -265,7 +265,7 @@ services: # context: ../../ # dockerfile: Dockerfile # args: - # RUNNER_IMAGE: alpine:3.16 + # RUNNER_IMAGE: alpine:3.17 # GO_VERSION: 1.19 ``` diff --git a/tests/localosmosis/docker-compose.yml b/tests/localosmosis/docker-compose.yml index 6c10554a207..c4fb2de3d5b 100644 --- a/tests/localosmosis/docker-compose.yml +++ b/tests/localosmosis/docker-compose.yml @@ -8,7 +8,7 @@ services: context: ../../ dockerfile: Dockerfile args: - RUNNER_IMAGE: alpine:3.16 + RUNNER_IMAGE: alpine:3.17 GO_VERSION: 1.19 volumes: - ./scripts/nativeDenomPoolA.json:/osmosis/nativeDenomPoolA.json diff --git a/tests/localosmosis/state_export/docker-compose.yml b/tests/localosmosis/state_export/docker-compose.yml index 220b8e755e0..6606e3675db 100644 --- a/tests/localosmosis/state_export/docker-compose.yml +++ b/tests/localosmosis/state_export/docker-compose.yml @@ -8,7 +8,7 @@ services: context: ../../../ dockerfile: Dockerfile args: - RUNNER_IMAGE: alpine:3.16 + RUNNER_IMAGE: alpine:3.17 GO_VERSION: 1.19 volumes: - ./scripts/start.sh:/osmosis/start.sh diff --git a/tests/localrelayer/docker-compose.yml b/tests/localrelayer/docker-compose.yml index f21c2c9b80b..1aa7d14841c 100644 --- a/tests/localrelayer/docker-compose.yml +++ b/tests/localrelayer/docker-compose.yml @@ -8,7 +8,7 @@ services: context: ../../ dockerfile: Dockerfile args: - RUNNER_IMAGE: alpine:3.16 + RUNNER_IMAGE: alpine:3.17 GO_VERSION: 1.19 volumes: - ./scripts/setup_chain.sh:/osmosis/setup.sh @@ -59,7 +59,7 @@ services: context: ../../ dockerfile: Dockerfile args: - RUNNER_IMAGE: alpine:3.16 + RUNNER_IMAGE: alpine:3.17 GO_VERSION: 1.19 volumes: - ./scripts/setup_chain.sh:/osmosis/setup.sh