diff options
| author | Demitri Swan <demitriswan@gmail.com> | 2019-11-30 20:29:05 +0000 |
|---|---|---|
| committer | Demitri Swan <demitriswan@gmail.com> | 2019-11-30 20:51:57 +0000 |
| commit | bdfe3ea25226b64675189ef64af2fdd5c2ad129e (patch) | |
| tree | 023815d7d3b8c5991eb6dd0792f25385285997c4 | |
| parent | 5c1c2b11900e2bd9710f2fd5cd5f6cec139fadb9 (diff) | |
issue-11: Fix dev environment
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | docker/Dockerfile | 3 |
2 files changed, 2 insertions, 3 deletions
@@ -4,7 +4,7 @@ SHELL = /bin/bash # Origin does not point to https://github.com/digitalocean/prometheus-client-c.git in TravisCI so we must add a new # remote for fetching. Fetch master, diff on the filenames and look for C files. If no changes to C files are made, skip # the build. -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]$$') +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$$') ifneq ($(shell echo "x${CHANGED_FILES}x" | sed 's/\n\t //'), xx) default: build_and_test diff --git a/docker/Dockerfile b/docker/Dockerfile index a27d2e7..48b0e52 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,8 +5,7 @@ RUN apt-get update && \ apt-get install -y curl tar build-essential git pkg-config gdb valgrind gcc libmicrohttpd-dev doxygen graphviz && \ curl -L https://dl.google.com/go/go1.13.1.linux-amd64.tar.gz 2> /dev/null | tar xzvf - -C /usr/local && \ mkdir -p /gopath/{src,bin} && \ - echo 'export GOPATH=/gopath' > /root/.bash_profile && \ - echo 'export PATH=$PATH:/usr/local/go/bin:/gopath/bin' > /root/.bash_profile && \ + printf 'export GOPATH=/gopath\nexport PATH=$PATH:/usr/local/go/bin:/gopath/bin\n' > /root/.bash_profile && \ printf '#!/usr/bin/env bash\nsource /root/.bash_profile\nexec /bin/bash $@\n' > /entrypoint && \ chmod +x /entrypoint && \ GOPATH=/gopath /usr/local/go/bin/go get github.com/prometheus/prom2json && \ |