Skip to content

Commit bdfe3ea

Browse files
committed
issue-11: Fix dev environment
1 parent 5c1c2b1 commit bdfe3ea

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SHELL = /bin/bash
44
# Origin does not point to https://github.com/digitalocean/prometheus-client-c.git in TravisCI so we must add a new
55
# remote for fetching. Fetch master, diff on the filenames and look for C files. If no changes to C files are made, skip
66
# the build.
7-
CHANGED_FILES = $(shell git remote add ci https://github.com/digitalocean/prometheus-client-c.git > /dev/null 2>&1; git fetch ci master > /dev/null 2>&1; git diff --name-only ci/master | egrep '.*[c|h]$$')
7+
CHANGED_FILES = $(shell git remote add ci https://github.com/digitalocean/prometheus-client-c.git > /dev/null 2>&1; git fetch ci master > /dev/null 2>&1; git diff --name-only ci/master | egrep -v '.*\.md$$')
88

99
ifneq ($(shell echo "x${CHANGED_FILES}x" | sed 's/\n\t //'), xx)
1010
default: build_and_test

docker/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ RUN apt-get update && \
55
apt-get install -y curl tar build-essential git pkg-config gdb valgrind gcc libmicrohttpd-dev doxygen graphviz && \
66
curl -L https://dl.google.com/go/go1.13.1.linux-amd64.tar.gz 2> /dev/null | tar xzvf - -C /usr/local && \
77
mkdir -p /gopath/{src,bin} && \
8-
echo 'export GOPATH=/gopath' > /root/.bash_profile && \
9-
echo 'export PATH=$PATH:/usr/local/go/bin:/gopath/bin' > /root/.bash_profile && \
8+
printf 'export GOPATH=/gopath\nexport PATH=$PATH:/usr/local/go/bin:/gopath/bin\n' > /root/.bash_profile && \
109
printf '#!/usr/bin/env bash\nsource /root/.bash_profile\nexec /bin/bash $@\n' > /entrypoint && \
1110
chmod +x /entrypoint && \
1211
GOPATH=/gopath /usr/local/go/bin/go get github.com/prometheus/prom2json && \

0 commit comments

Comments
 (0)