Skip to content

Commit

Permalink
Merge pull request #13 from alhazmy13/develop
Browse files Browse the repository at this point in the history
Fix influxdb crashing
  • Loading branch information
alhazmy13 authored Dec 19, 2022
2 parents 56682bd + fbf5946 commit 8c9de7b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 243 deletions.
Binary file modified .DS_Store
Binary file not shown.
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
images: alhazmy13/telegraf-influxdb-grafana
tags: |
type=ref,event=branch
type=ref,event=tag
type=ref,event=pr
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=raw,value=latest,enable={{is_default_branch}}
-
# Setting up Docker Buildx with docker-container driver is required
# at the moment to be able to use a subdirectory with Git context
Expand All @@ -44,7 +44,8 @@ jobs:
with:
context: "{{defaultContext}}:docker"
push: true
tags: alhazmy13/telegraf-influxdb-grafana:latest
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

push-docker-readme:
runs-on: ubuntu-latest
Expand Down
2 changes: 0 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ RUN wget https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION

# Configure InfluxDB
COPY influxdb/influxdb.conf /etc/influxdb/influxdb.conf
COPY influxdb/init.sh /etc/init.d/influxdb
RUN chmod 0777 /var/lib/influxdb
RUN chmod 0777 /etc/init.d/influxdb

#install syslog-ng
COPY syslog/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf
Expand Down
237 changes: 0 additions & 237 deletions docker/influxdb/init.sh

This file was deleted.

2 changes: 1 addition & 1 deletion docker/supervisord/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ command = /usr/sbin/sshd -D

[program:influxdb]
priority = 2
command = bash -c "/etc/init.d/influxdb start && sleep 5"
command = /usr/bin/influxd -pidfile /var/run/influxdb/influxd.pid -config /etc/influxdb/influxdb.conf

[program:syslog]
priority = 3
Expand Down

0 comments on commit 8c9de7b

Please sign in to comment.