Skip to content

Commit a6f12f6

Browse files
authored
Merge pull request #8 from ringtail/feature/alibaba-cloud-v0.8.0
Feature/alibaba cloud v0.8.0
2 parents 5ca0bb2 + 15ca7f5 commit a6f12f6

File tree

2,934 files changed

+707549
-140131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,934 files changed

+707549
-140131
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
/*.tar.gz
55
ci.env
66
pr.env
7+
junit*.xml

.travis.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ sudo: required
44
dist: trusty
55
language: go
66
go:
7-
- "1.9"
8-
- "1.10"
97
- "1.11"
108
- "1.12"
119
- master
10+
env:
11+
- GO111MODULE=on
1212
services:
1313
- docker
1414
before_install:
@@ -21,3 +21,11 @@ install:
2121
script:
2222
- make
2323
- make test
24+
- make clean && BUILD_TAGS="disable_custom_plugin_monitor" make
25+
- BUILD_TAGS="disable_custom_plugin_monitor" make test
26+
- make clean && BUILD_TAGS="disable_system_log_monitor" make
27+
- BUILD_TAGS="disable_system_log_monitor" make test
28+
- make clean && BUILD_TAGS="disable_system_stats_monitor" make
29+
- BUILD_TAGS="disable_system_stats_monitor" make test
30+
- make clean && BUILD_TAGS="disable_stackdriver_exporter" make
31+
- BUILD_TAGS="disable_stackdriver_exporter" make test

Dockerfile.in

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,16 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM @BASEIMAGE@
15+
FROM centos:7
1616
MAINTAINER Random Liu <[email protected]>
1717

18-
RUN clean-install libsystemd0 bash
18+
# RUN clean-install libsystemd0 bash
1919

20-
RUN apt-get update && apt-get install -y lsof \
21-
&& rm -rf /var/lib/apt/lists/*
20+
# RUN apt-get update && apt-get install -y lsof curl && rm -rf /var/lib/apt/lists/*
21+
22+
RUN yum update -y \
23+
&& yum install -y lsof curl \
24+
&& yum clean all
2225

2326
# Avoid symlink of /etc/localtime.
2427
RUN test -h /etc/localtime && rm -f /etc/localtime && cp /usr/share/zoneinfo/UTC /etc/localtime || true

0 commit comments

Comments
 (0)