Skip to content

Commit 6fbfbc1

Browse files
author
Jef Spaleta
authored
Merge pull request #38 from sensu/update-alpine-3.14
Update alpine 3.14
2 parents 38ee68c + e43f905 commit 6fbfbc1

File tree

5 files changed

+26
-12
lines changed

5 files changed

+26
-12
lines changed

.bonsai.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ builds:
1818
- "entity.system.os == 'linux'"
1919
- "entity.system.arch == 'amd64'"
2020
- "entity.system.platform_family == 'debian'"
21+
- platform: "centos6"
22+
arch: "amd64"
23+
asset_filename: "#{repo}_#{version}_ruby-2.4.4_centos6_linux_amd64.tar.gz"
24+
sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
25+
filter:
26+
- "entity.system.os == 'linux'"
27+
- "entity.system.arch == 'amd64'"
28+
- "entity.system.platform != 'amazon'"
29+
- "entity.system.platform_family == 'rhel'"
30+
- "parseInt(entity.system.platform_version.split('.')[0]) == 6"
2131
- platform: "centos7"
2232
arch: "amd64"
2333
asset_filename: "#{repo}_#{version}_ruby-2.4.4_centos7_linux_amd64.tar.gz"

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ and this project adheres to [Semantic
66
Versioning](http://semver.org/spec/v2.0.0.html).
77

88
## Unreleased
9+
10+
## [0.2.0] - 2020-07-23
11+
12+
### Changed
13+
- Added centos6 image back
14+
- Updated alpine image to alpine 3.14
15+
916
## [0.0.11] - 2020-09-17
1017

1118
### Added

Dockerfile.alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.8
1+
FROM alpine:3.14
22

33
ARG RUBY_VERSION=2.4.4
44
ARG ASSET_VERSION=local_build

build_scripts/build_alpine_platforms.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,7 @@ mkdir -p assets
55
mkdir -p scripts
66

77
# Alpine platform
8-
platform="alpine" test_platforms="alpine:latest alpine:3 alpine:3.8" ./build_and_test_platform.sh
9-
retval=$?
10-
if [[ retval -ne 0 ]]; then
11-
exit $retval
12-
fi
13-
platform="alpine3.8" test_platforms="alpine:latest alpine:3 alpine:3.8" ./build_and_test_platform.sh
8+
platform="alpine" test_platforms="alpine:latest alpine:3" ./build_and_test_platform.sh
149
retval=$?
1510
if [[ retval -ne 0 ]]; then
1611
exit $retval

build_scripts/build_centos_platforms.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ mkdir -p dist
44
mkdir -p assets
55
mkdir -p scripts
66

7-
# CentOS 8 platform
8-
platform="centos8" test_platforms="centos:8 debian:10 ubuntu:20.04" ./build_and_test_platform.sh
7+
# CentOS 6 platform
8+
# Note: EOL Nov 30, 2020
9+
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
910
retval=$?
1011
if [[ retval -ne 0 ]]; then
1112
exit $retval
@@ -18,14 +19,15 @@ if [[ retval -ne 0 ]]; then
1819
exit $retval
1920
fi
2021

21-
# CentOS 6 platform
22-
# Note: EOL Nov 30, 2020
23-
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
22+
# CentOS 8 platform
23+
platform="centos8" test_platforms="centos:8 debian:10 ubuntu:20.04" ./build_and_test_platform.sh
2424
retval=$?
2525
if [[ retval -ne 0 ]]; then
2626
exit $retval
2727
fi
2828

29+
30+
2931
## CentOS platform
3032
#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
3133
#retval=$?

0 commit comments

Comments
 (0)