Merge pull request #5 from gremlin/docker-image-fix

cleaned up unwanted docker crud

Author: khultman

.gitignore

@@ -109,6 +109,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+env.vars
 
 # Spyder project settings
 .spyderproject

Dockerfile

@@ -1,15 +1,11 @@
 FROM alpine:latest
 LABEL maintainer="kyle@gremlin.com"
 
-
 # Runtime arguments
 ARG BUILD_DATE
 ARG IMAGE_NAME
-ARG KUBECTL_VERSION="v1.16.1"
-ARG KUBECTL_DOWNLOAD="https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl"
-ARG HELM_DOWNLOAD="https://raw.githubusercontent.com/helm/helm/master/scripts/get"
-ARG EKSCTL_DOWNLOAD="https://github.com/weaveworks/eksctl/releases/download/latest_release/eksctl_Linux_amd64.tar.gz"
 ARG AWS_IAMAUTH_DOWNLOAD="https://amazon-eks.s3-us-west-2.amazonaws.com/1.14.6/2019-08-22/bin/linux/amd64/aws-iam-authenticator"
+ARG GREMLIN_PYTHON_REPO="https://github.com/gremlin/gremlin-python.git"
 
 # Container Labels
 LABEL org.label-schema.schema-version="1.0"
@@ -27,21 +23,19 @@ RUN python3 -m ensurepip  && \
     if [[ ! -e /usr/bin/python ]]; then ln -sf /usr/bin/python3 /usr/bin/python; fi && \
     rm -r /root/.cache
 
-RUN pip --no-cache-dir install --upgrade awscli bitly_api boto3 datadog jinja2 kubernetes==9.0.1
+RUN pip --no-cache-dir install --upgrade awscli boto3
 
-RUN curl $HELM_DOWNLOAD | bash
+RUN curl -s -L $AWS_IAMAUTH_DOWNLOAD -o /usr/local/bin/aws-iam-authenticator && chmod 755 /usr/local/bin/aws-iam-authenticator
 
-RUN curl --silent --location $EKSCTL_DOWNLOAD | tar xz -C /usr/local/bin && chmod 755 /usr/local/bin/eksctl
+RUN mkdir -p /opt/gremlin-python
 
-RUN curl -s -L $AWS_IAMAUTH_DOWNLOAD -o /usr/local/bin/aws-iam-authenticator && chmod 755 /usr/local/bin/aws-iam-authenticator
+WORKDIR /opt/gremlin-python
 
-RUN echo $KUBECTL_DOWNLOAD
-RUN curl -s -L $KUBECTL_DOWNLOAD -o /usr/bin/kubectl && chmod 755 /usr/bin/kubectl
+# RUN git clone $GREMLIN_PYTHON_REPO .
+COPY . .
 
-RUN mkdir -p /opt/gremlin-python
-#ADD src /opt/bootcamp
-#
-#RUN chmod 755 /opt/bootcamp/bootcamp.py
+# uncomment to install the package container wide
+# RUN python3 setup.py install
 
-ENTRYPOINT ["python3", "/opt/bootcamp/bootcamp.py", "-x"]
-CMD ["make build"]
+ENTRYPOINT ["/bin/ash"]
+CMD ["/bin/ash"]

Makefile

@@ -2,32 +2,17 @@ DOCKER_OWNER=gremlin
 DOCKER_NAME=gremlin-python-api
 DOCKER_IMAGE=$(DOCKER_OWNER)/$(DOCKER_NAME)
 
-MAJOR_VERSION_FILE=docker-build-major-version.txt
-MINOR_VERSION_FILE=docker-build-minor-version.txt
-BUILD_VERSION_FILE=docker-build-version.txt
-BUILD_VERSION=$(shell cat $(MAJOR_VERSION_FILE)).$(shell cat $(MINOR_VERSION_FILE))
 BUILD_DATE=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
-
-KUBECTL_VERSION=$(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
-
 ENV_VARS=env.vars
 
-all: docker-build #docker-push
+all: docker-build
 
-docker-build: $(MINOR_VERSION_FILE)
-	BUILD_VERSION=$(shell cat $(MAJOR_VERSION_FILE)).$(shell cat $(MINOR_VERSION_FILE))
+docker-build:
 	docker build --no-cache=true \
 	             --build-arg BUILD_DATE=$(BUILD_DATE) \
 	             --build-arg IMAGE_NAME=$(DOCKER_IMAGE) \
-	             --build-arg KUBECTL_VERSION=$(KUBECTL_VERSION) \
-	             -t $(DOCKER_IMAGE):$(BUILD_VERSION) \
 	             -t $(DOCKER_IMAGE):latest \
 	             .
-	echo ${BUILD_VERSION} > $(BUILD_VERSION_FILE)
-
-docker-push:
-	docker push $(DOCKER_IMAGE):$(BUILD_VERSION)
-	docker push $(DOCKER_IMAGE):latest
 
 docker-run:
 	@if ! test -f $(ENV_VARS); then touch $(ENV_VARS); fi
@@ -38,13 +23,3 @@ docker-run-interactive:
 	@if ! test -f $(ENV_VARS); then touch $(ENV_VARS); fi
 	docker run -it --rm -v ~/.ssh/:/root/.ssh --mount type=bind,source="$(PWD)",target=/opt/gremlin-python \
 	--env-file=env.vars --name $(DOCKER_NAME) --entrypoint "/bin/ash" $(DOCKER_IMAGE):latest
-
-$(MAJOR_VERSION_FILE):
-	@if ! test -f $(MAJOR_VERSION_FILE); then echo 0 > $(MAJOR_VERSION_FILE); fi
-	@echo $$(($$(shell cat $(MAJOR_VERSION_FILE)) + 1)) > $(MAJOR_VERSION_FILE)
-	@echo $$(($$(shell cat $(MAJOR_VERSION_FILE)).$(shell cat $(MINOR_VERSION_FILE)))) > $(BUILD_VERSION_FILE)
-
-$(MINOR_VERSION_FILE):
-	@if ! test -f $(MINOR_VERSION_FILE); then echo 0 > $(MINOR_VERSION_FILE); fi
-	@echo $$(($$(shell cat $(MINOR_VERSION_FILE)) + 1)) > $(MINOR_VERSION_FILE)
-	@echo $$(($$(shell cat $(MAJOR_VERSION_FILE)).$(shell cat $(MINOR_VERSION_FILE)))) > $(BUILD_VERSION_FILE)