Skip to content

Commit c3a66e1

Browse files
Task: remove carry over from cookiecutter
1 parent 30fb9a8 commit c3a66e1

File tree

3 files changed

+1
-10
lines changed

3 files changed

+1
-10
lines changed

Dockerfile.dev

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@ RUN wget -O /usr/local/bin/jq "https://github.com/stedolan/jq/releases/download/
1313
&& wget -O /usr/local/bin/yaml "https://github.com/mikefarah/yq/releases/download/${YAML_BIN_VERSION}/yaml_linux_amd64" \
1414
&& chmod 755 /usr/local/bin/yaml
1515

16-
ARG DEVELOPER
17-
18-
RUN git config --global user.name "${DEVELOPER}" \
19-
&& git config --global user.email "${DEVELOPER}@cisco.com" \
20-
&& git config --global core.fileMode false \
21-
&& git config --list
22-
2316
ENV GLIDE_VERSION v0.13.1
2417

2518
RUN go get github.com/alecthomas/gometalinter \

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ tmp/dev_image_id: Dockerfile.dev
6060
@mkdir -p tmp
6161
@docker rmi -f ${DEV_IMAGE} > /dev/null 2>&1 || true
6262
@echo "## Building dev container"
63-
@docker build --quiet -t ${DEV_IMAGE} --build-arg DEVELOPER="${DEVELOPER}" -f Dockerfile.dev .
63+
@docker build --quiet -t ${DEV_IMAGE} -f Dockerfile.dev .
6464
@docker inspect -f "{{ .ID }}" ${DEV_IMAGE} > tmp/dev_image_id
6565

6666
# ----------------------------------------------

Makefile.variables

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ export PROJECT = $(shell awk '/name: / { print $$2; exit }' ${PROJECT_FILE})
33
IMPORT_PATH = $(shell awk '/import: / { print $$2; exit }' ${PROJECT_FILE})
44

55

6-
DEVELOPER ?= $(shell whoami)
7-
86
CI ?=
97
ifeq ($(strip $(CI)),)
108
CI_ENABLED := 0

0 commit comments

Comments
 (0)