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

[chores] Update alpine docker base image to alpine:3.17 #4893

Merged
merged 3 commits into from
Apr 11, 2023
Merged

[chores] Update alpine docker base image to alpine:3.17 #4893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20c2f26
Update alpine base image to 3.17
Apr 11, 2023
e16ff9e
Update .dockerignore
Apr 11, 2023
1bcb718
Update CHANGELOG.md
Apr 11, 2023
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 .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ networks/
proto/
scripts/
tools/
tests/cl-go-client
tests/
.github/
.git/
.vscode/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-dev-docker-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push-docker-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/localosmosis/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ services:
# context: ../../
# dockerfile: Dockerfile
# args:
# RUNNER_IMAGE: alpine:3.16
# RUNNER_IMAGE: alpine:3.17
# GO_VERSION: 1.19
```

Expand Down
2 changes: 1 addition & 1 deletion tests/localosmosis/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/localosmosis/state_export/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/localrelayer/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down