fix: makefile and scripts

Author: relloyd

Makefile

@@ -5,9 +5,9 @@
 TEST_MODULES = actions cmd components config constants file helper plugin-loader rdbms table-definition transform
 HP_VERSION:=$(shell git describe --tags --abbrev=0 | tr -d '[:space:]')
 ORA_VERSION=19.14
+BUILD_DATE=$(shell date +%F)  # use +%FT%H:%M%z for format '2020-10-08T17:55+0100'
 OSARCH=$(shell uname | tr "[:upper:]" "[:lower:]")
 GOARCH=amd64
-BUILD_DATE=$(shell date +%F)  # use +%FT%H:%M%z for format '2020-10-08T17:55+0100'
 LD_FLAGS:=-X github.com/relloyd/halfpipe/cmd.version=${HP_VERSION} -X github.com/relloyd/halfpipe/cmd.buildDate=${BUILD_DATE} -X github.com/relloyd/halfpipe/cmd.osArch=${OSARCH}
 LD_FLAGS_VERBOSE:="-v"
 LD_FLAGS_DEV:=-ldflags "${LD_FLAGS}"
@@ -115,12 +115,12 @@ build-linux: check-ora-vars
 	CGO_ENABLED=1 GOOS=$(OSARCH) GOARCH=$(GOARCH) go build -v -trimpath $(LD_FLAGS_RELEASE) -buildmode=plugin -o dist/hp-odbc-plugin.so rdbms/odbc/main.go
 
 ###############################################################################
-# BUILD & INSTALL
+# BUILD & INSTALL NATIVE BINARIES
 ###############################################################################
 
 .PHONY: install
 install: build
-	cp -p dist/hp ~/go/bin/
+	cp -p dist/hp $$GOPATH/bin/
 
 .PHONY: install-so
 install-so: build build-so
@@ -135,29 +135,41 @@ install-so: build build-so
 docker-build:
 	scripts/docker-build.sh $(ORA_VERSION) $(HP_VERSION) relloyd/halfpipe-oracle-$(ORA_VERSION)
 
-.PHONY: docker-get-files
-docker-get-files:
-	$(eval RELEASE_DIR=dist/hp-linux-amd64-$(HP_VERSION)-oracle-$(ORA_VERSION))
-	mkdir -p $(RELEASE_DIR)
-	$(eval id=$(shell docker create relloyd/halfpipe-oracle-$(ORA_VERSION)):$(HP_VERSION)))
-	docker cp $(id):/usr/local/bin/hp $(RELEASE_DIR)
-	docker cp $(id):/usr/local/lib/hp-odbc-plugin.so $(RELEASE_DIR)
-	docker cp $(id):/usr/local/lib/hp-oracle-plugin.so $(RELEASE_DIR)
-	docker rm -v $(id)
+.PHONY: docker-run
+docker-run:
+	mkdir -p $$HOME/.halfpipe && \
+	docker run -ti --rm \
+		-v $$HOME/.halfpipe:/home/dataops/.halfpipe \
+		relloyd/halfpipe-oracle-$(ORA_VERSION):latest
 
 ###############################################################################
 # QUICKSTART
+#
+# 1. Build the core halfpipe docker image with additional tools like
+#    AWS CLI, kubectl, k9s, less and other CLI hacks.
+# 2. Start the image with .aws and .halfpipe directories mounted
+#    and AWS_PROFILE=halfpipe
+#
 ###############################################################################
 
 .PHONY: quickstart
-quickstart:
-	$(MAKE) docker-build
-	scripts/start-halfpipe.sh relloyd/halfpipe-oracle-$(ORA_VERSION)
+quickstart: docker-build
+	scripts/start-halfpipe.sh relloyd/halfpipe-oracle-$(ORA_VERSION):latest
 
 ###############################################################################
 # RELEASES
 ###############################################################################
 
+.PHONY: docker-get-files
+docker-get-files:
+	$(eval RELEASE_DIR=dist/hp-linux-amd64-$(HP_VERSION)-oracle-$(ORA_VERSION))
+	mkdir -p $(RELEASE_DIR)
+	$(eval id=$(shell docker create relloyd/halfpipe-oracle-$(ORA_VERSION)):$(HP_VERSION)))
+	docker cp $(id):/usr/local/bin/hp $(RELEASE_DIR)
+	docker cp $(id):/usr/local/lib/hp-odbc-plugin.so $(RELEASE_DIR)
+	docker cp $(id):/usr/local/lib/hp-oracle-plugin.so $(RELEASE_DIR)
+	docker rm -v $(id)
+
 .PHONY: release
 release: release-darwin release-linux
 	@echo Release complete

image/Dockerfile-quickstart

@@ -1,30 +1,21 @@
-ARG HP_VERSION
 ARG ORA_VERSION
 
-FROM relloyd/halfpipe-oracle-${ORA_VERSION}-no-oci:${HP_VERSION}
+FROM relloyd/halfpipe-oracle-${ORA_VERSION}:latest
 
 USER root
 
+# AWS CLI
+
 RUN apt-get update -y \
     && apt-get install -y curl less vim libaio1 ca-certificates unzip glibc-source groff \
     && curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
     && unzip awscliv2.zip \
     && ./aws/install \
     && rm awscliv2.zip
 
-# Oracle client (use LD_LIBRARY_PATH from parent image).
-
-RUN cd /tmp \
-    && curl -L https://download.oracle.com/otn_software/linux/instantclient/19800/instantclient-basiclite-linux.x64-19.8.0.0.0dbru.zip -o instantclient-basiclite-linux.x64-19.8.0.0.0dbru.zip \
-    && for i in instantclient*19.8*.zip; do unzip "$i"; done \
-    && rm instantclient*19.8*.zip \
-    && mv instantclient* /usr/lib/instantclient
-
 # Kubectl
 
-ARG K8S_VERSION
-ENV K8S_VERSION=${K8S_VERSION}
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/kubectl \
+RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" \
     && chmod +x ./kubectl \
     && mv ./kubectl /usr/local/bin/kubectl \
     && echo "alias k=kubectl" >> .bashrc
@@ -33,7 +24,7 @@ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/${K8S_VER
 
 RUN mkdir -p /usr/local/k9s \
     && cd /usr/local/k9s \
-    && curl -L https://github.com/derailed/k9s/releases/download/0.9.2/k9s_0.9.2_Linux_x86_64.tar.gz -o k9s.tar.gz \
+    && curl -L https://github.com/derailed/k9s/releases/download/v0.25.18/k9s_Linux_x86_64.tar.gz -o k9s.tar.gz \
     && tar xvzf k9s.tar.gz \
     && rm k9s.tar.gz \
     && chmod +x k9s \
@@ -42,15 +33,8 @@ RUN mkdir -p /usr/local/k9s \
 
 USER dataops
 
-# Set the halfpipe version so scripts can use it as a default.
-
-ARG HP_VERSION
-ENV HP_VERSION=${HP_VERSION}
-
 # Scripts
 
-COPY --chown=dataops:dataops kubes/template/ /home/dataops/.template/
-COPY --chown=dataops:dataops kubes/create-k8s-pipe-job /home/dataops/
 COPY --chown=dataops:dataops configure.sh /home/dataops/
 COPY --chown=dataops:dataops .template-variables.env /home/dataops/
 

oci8-docker.pc

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-set -e  # exit after any failure
+set -e
 
-script_dir=`dirname $0`
-image_name=${1:?"Supply the halfpipe Docker image name as \$1"}
+image=${1:?"Supply the halfpipe Docker image:tag as \$1"}
+script_dir=$(dirname "$0")
 default_aws_profile=halfpipe
 default_port=8080
 
@@ -17,7 +17,7 @@ Usage: $0 [ -a <AWS profile name> ] [-p <port>]"
 
    -a  supplies a profile name found in '$HOME/.aws/credentials'
        to set AWS access keys in the container (default: ${default_aws_profile})
-   -p  port to expose for Halfpipe's micro-service used by 'hp pipe' commands
+   -p  port to expose for Halfpipe's microservice used by 'hp pipe' commands
        (default: $default_port)
 
 EOF
@@ -40,36 +40,28 @@ if [[ -z "${aws_profile}" ]]; then  # if the profile has NOT been set...
   aws_profile="${default_aws_profile}"  # use the default.
 fi
 
-if [[ "$kube" -eq 1 ]]; then  # if we should mount ~/.kube/config...
-  if [[ -d "$HOME/.kube" ]]; then  # if the directory exists...
-    # Get ready to mount the directory.
-    kube_mount="-v \"$HOME/.kube\":/home/dataops/.kube"
-  else  # else there is no .kube directory...
-    # Abort.
-    echo "Error: \"$HOME/.kube\" directory not found and -k flag specified"
-    usage
-  fi
-fi
-
 if [[ -z "$port" ]]; then  # if the port has NOT been set...
   port=$default_port
 fi
 
 # Create if not exists the halfpipe home dir.
+
 mkdir -p ~/.halfpipe
 
 # Add defaults for the first time.
+
 if [[ ! -f "$HOME/.halfpipe/config.yaml" ]]; then  # if there are no existing config defaults...
   echo "Using default config file config.yaml"
   cp "${script_dir}/.default-config.yaml" "$HOME/.halfpipe/config.yaml"
 fi
 
 # Start Halfpipe container.
-echo "Starting ${image_name}:latest using AWS profile \"${aws_profile}\"..."
+
+echo "Starting ${image}:latest using AWS profile \"${aws_profile}\"..."
 cmd="docker run -ti --rm \\
     -v ~/.halfpipe:/home/dataops/.halfpipe \\
     -v ~/.aws:/home/dataops/.aws \\
     -e AWS_PROFILE=\"${aws_profile}\" \\
     -p ${port}:8080 \\
-    ${image_name}:latest"
+    ${image}"
 eval "$cmd"