Skip to content

Commit

Permalink
Merge pull request #38 from sensu/update-alpine-3.14
Browse files Browse the repository at this point in the history
Update alpine 3.14
  • Loading branch information
Jef Spaleta authored Jul 24, 2021
2 parents 38ee68c + e43f905 commit 6fbfbc1
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 12 deletions.
10 changes: 10 additions & 0 deletions .bonsai.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,16 @@ builds:
- "entity.system.os == 'linux'"
- "entity.system.arch == 'amd64'"
- "entity.system.platform_family == 'debian'"
- platform: "centos6"
arch: "amd64"
asset_filename: "#{repo}_#{version}_ruby-2.4.4_centos6_linux_amd64.tar.gz"
sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
filter:
- "entity.system.os == 'linux'"
- "entity.system.arch == 'amd64'"
- "entity.system.platform != 'amazon'"
- "entity.system.platform_family == 'rhel'"
- "parseInt(entity.system.platform_version.split('.')[0]) == 6"
- platform: "centos7"
arch: "amd64"
asset_filename: "#{repo}_#{version}_ruby-2.4.4_centos7_linux_amd64.tar.gz"
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ and this project adheres to [Semantic
Versioning](http://semver.org/spec/v2.0.0.html).

## Unreleased

## [0.2.0] - 2020-07-23

### Changed
- Added centos6 image back
- Updated alpine image to alpine 3.14

## [0.0.11] - 2020-09-17

### Added
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.8
FROM alpine:3.14

ARG RUBY_VERSION=2.4.4
ARG ASSET_VERSION=local_build
Expand Down
7 changes: 1 addition & 6 deletions build_scripts/build_alpine_platforms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@ mkdir -p assets
mkdir -p scripts

# Alpine platform
platform="alpine" test_platforms="alpine:latest alpine:3 alpine:3.8" ./build_and_test_platform.sh
retval=$?
if [[ retval -ne 0 ]]; then
exit $retval
fi
platform="alpine3.8" test_platforms="alpine:latest alpine:3 alpine:3.8" ./build_and_test_platform.sh
platform="alpine" test_platforms="alpine:latest alpine:3" ./build_and_test_platform.sh
retval=$?
if [[ retval -ne 0 ]]; then
exit $retval
Expand Down
12 changes: 7 additions & 5 deletions build_scripts/build_centos_platforms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ mkdir -p dist
mkdir -p assets
mkdir -p scripts

# CentOS 8 platform
platform="centos8" test_platforms="centos:8 debian:10 ubuntu:20.04" ./build_and_test_platform.sh
# CentOS 6 platform
# Note: EOL Nov 30, 2020
platform="centos6" test_platforms="centos:6 centos:7 centos:8 debian:8 debian:9 debian:10 ubuntu:14.04 ubuntu:16.04 ubuntu:18.04" ./build_and_test_platform.sh
retval=$?
if [[ retval -ne 0 ]]; then
exit $retval
Expand All @@ -18,14 +19,15 @@ if [[ retval -ne 0 ]]; then
exit $retval
fi

# CentOS 6 platform
# Note: EOL Nov 30, 2020
platform="centos6" test_platforms="centos:6 centos:7 centos:8 debian:8 debian:9 debian:10 ubuntu:14.04 ubuntu:16.04 ubuntu:18.04" ./build_and_test_platform.sh
# CentOS 8 platform
platform="centos8" test_platforms="centos:8 debian:10 ubuntu:20.04" ./build_and_test_platform.sh
retval=$?
if [[ retval -ne 0 ]]; then
exit $retval
fi



## CentOS platform
#platform="centos" test_platforms="centos:8 centos:7 debian:8 debian:9 debian:10 ubuntu:14.04 ubuntu:16.04 ubuntu:18.04 ubuntu:20.04" ./build_and_test_platform.sh
#retval=$?
Expand Down

0 comments on commit 6fbfbc1

Please sign in to comment.