Bunch of updates

darrellmeyer · darrellmeyer · commit e6d47a669c32 · 2019-08-06T00:01:09.000-04:00
diff --git a/circleci-node-openjdk/Dockerfile b/circleci-node-openjdk/Dockerfile
@@ -0,0 +1,6 @@
+FROM circleci/node:11.14.0-stretch
+
+RUN \
+  sudo apt-get update && \
+  sudo apt-get install openjdk-8-jre && \
+  sudo rm -rf /var/lib/apt/lists/*
diff --git a/circleci-node-openjdk/version b/circleci-node-openjdk/version
@@ -0,0 +1 @@
+11.14.0
diff --git a/circleci-sbt/Dockerfile b/circleci-sbt/Dockerfile
@@ -1,25 +1,12 @@
-FROM openjdk:11.0.1-jre-slim
-
-RUN \
-  apt-get update -y && \
-  apt-get install -y git python curl unzip && apt-get clean
-
-RUN \
-  curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip" && \
-  unzip awscli-bundle.zip && \
-  ./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws && \
-  rm -Rf awscli-bundle.zip awscli-bundle && \
-  aws --version
+FROM circleci/openjdk:8u212-jdk-stretch
 
 ENV PATH="$PATH:/sbt/bin"
 ENV SBT_VERSION="1.2.8"
 
 RUN \
-  curl -Lo /usr/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 && \
-  chmod +x /usr/bin/jq
-
-RUN \
-  mkdir /sbt && cd /sbt && \
+  sudo mkdir /sbt && \
+  sudo chown circleci:circleci /sbt && \
+  cd /sbt && \
   curl -Lo sbt.zip https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.zip && \
   unzip sbt.zip && rm -Rf sbt.zip && rm -Rf sbt/lib && mv /sbt/sbt/* /sbt/ && rm -Rf sbt && \
   chmod a+x /sbt/bin/sbt && \
diff --git a/circleci-sbt/version b/circleci-sbt/version
@@ -1 +1 @@
-1.2.8
+8u212-1.2.8
diff --git a/cli b/cli
@@ -13,18 +13,19 @@ set -euo pipefail
 
 reconcile_tool() {
   NAME=${1:?"Tool name is required"}
+  FORCE=${2:-""}
   echo "Reconciling ${NAME}..."
   CURRENT_VERSION=$(docker-registry-semver-bump -image shopstic/${NAME} -version current)
   NEW_VERSION=$(cat ./${NAME}/version)
 
-  if [[ "${CURRENT_VERSION}" == "${NEW_VERSION}" ]]; then
+  if [[ "${CURRENT_VERSION}" == "${NEW_VERSION}" && "${FORCE}" != "force" ]]; then
     echo "No need to update ${NAME}"
     exit 0
   fi
 
   echo "Updating ${NAME} from ${CURRENT_VERSION} to ${NEW_VERSION}"
   cd "./${NAME}"
-  docker build --build-arg "SHOPSTIC_GITHUB_TOKEN=${SHOPSTIC_GITHUB_TOKEN}" -t "shopstic/${NAME}:${NEW_VERSION}" .
+  docker build --build-arg "SHOPSTIC_GITHUB_TOKEN=${SHOPSTIC_GITHUB_TOKEN}" --build-arg "PACKAGE_VERSION=${NEW_VERSION}" -t "shopstic/${NAME}:${NEW_VERSION}" .
   docker push "shopstic/${NAME}:${NEW_VERSION}"
 }
 
diff --git a/dcos-kafka/Dockerfile b/dcos-kafka/Dockerfile
@@ -0,0 +1,5 @@
+FROM confluentinc/cp-kafka:5.1.2
+
+ADD ./entrypoint.sh /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/dcos-kafka/entrypoint.sh b/dcos-kafka/entrypoint.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+PORT_BROKER=${PORT_BROKER:?"PORT_BROKER is missing"}
+KAFKA_ADVERTISED_LISTENERS="PLAINTEXT://${HOST}:${PORT_BROKER}"
+KAFKA_JVM_PERFORMANCE_OPTS=${KAFKA_JVM_PERFORMANCE_OPTS}
+KAFKA_JVM_PERFORMANCE_OPTS="${KAFKA_JVM_PERFORMANCE_OPTS} -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=$PORT_JMX -Dcom.sun.management.jmxremote.rmi.port=$PORT_JMX -Dcom.sun.management.jmxremote.host=0.0.0.0 -Djava.rmi.server.hostname=$HOST -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"
+echo "KAFKA_JVM_PERFORMANCE_OPTS=${KAFKA_JVM_PERFORMANCE_OPTS}"
+
+exec /etc/confluent/docker/run
diff --git a/dcos-kafka/version b/dcos-kafka/version
@@ -0,0 +1 @@
+5.1.3
diff --git a/envoy-lb/Dockerfile b/envoy-lb/Dockerfile
diff --git a/httpie/Dockerfile b/httpie/Dockerfile
@@ -0,0 +1,6 @@
+FROM alpine:latest
+
+RUN apk add --no-cache jq httpie
+
+ENTRYPOINT [ "http" ]
+CMD [ "--help" ]
diff --git a/httpie/version b/httpie/version
@@ -0,0 +1 @@
+0.0.1
diff --git a/kafka-connect-with-datagen/Dockerfile b/kafka-connect-with-datagen/Dockerfile
@@ -0,0 +1,5 @@
+FROM confluentinc/cp-kafka-connect:5.3.0
+
+ENV CONNECT_PLUGIN_PATH="/usr/share/java,/usr/share/confluent-hub-components"
+
+RUN  confluent-hub install --no-prompt confluentinc/kafka-connect-datagen:0.1.3
diff --git a/kafka-connect-with-datagen/version b/kafka-connect-with-datagen/version
@@ -0,0 +1 @@
+0.1.3
diff --git a/node-app/Dockerfile b/node-app/Dockerfile
@@ -1,7 +1,9 @@
-FROM node:11.8.0-alpine
+FROM node:11.14.0-stretch
 
-RUN apk add --update dumb-init && rm -rf /var/cache/apk/*
+RUN \
+  wget -O /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64 && \
+  chmod +x /usr/local/bin/dumb-init
 
 WORKDIR /app
 
-ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]
diff --git a/node-app/version b/node-app/version
@@ -1 +1 @@
-11.8.1
+11.14.0
diff --git a/protobuf-ts/Dockerfile b/protobuf-ts/Dockerfile
@@ -0,0 +1,15 @@
+FROM shopstic/protobuf:0.0.1
+
+RUN apk add --no-cache nodejs bash curl
+
+RUN npm set progress=false && \
+    npm config set depth 0 && \
+    npm install -g ts-protoc-gen google-protobuf && \
+    npm cache clean --force
+
+RUN mkdir /protobuf/scalapb && \
+    curl -Lo /protobuf/scalapb/scalapb.proto https://raw.githubusercontent.com/scalapb/ScalaPB/master/protobuf/scalapb/scalapb.proto
+
+COPY ./entrypoint.sh /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/protobuf-ts/entrypoint.sh b/protobuf-ts/entrypoint.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+mkdir /in
+cp -R /proto/*/* /in/
+cp -R /protobuf/* /in/
+
+OUT_FILES_ARR=("$@")
+OUT_FILES=${OUT_FILES_ARR[@]/#/\/in\/}
+
+echo "Linting: ${OUT_FILES}"
+
+protoc --lint_out=/out -I /in ${OUT_FILES}
+
+echo "Compiling..."
+
+protoc \
+  -I /in \
+  --include_imports \
+  --descriptor_set_out=/tmp/desc \
+  --dependency_out=/tmp/deps \
+  ${OUT_FILES}
+
+DEPS_ARR=($(cat /tmp/deps | tr '\n' ' ' | sed 's/\\//g'))
+DEPS_ARR=(${DEPS_ARR[@]/#\/in\/})
+DEPS_ARR=(${DEPS_ARR[@]//google\/*/})
+DEPS=${DEPS_ARR[@]//scalapb\/*/}
+
+echo "Going to compile: ${DEPS}"
+
+rm -Rf /out/*
+
+exec protoc \
+  --plugin=ts-protoc-gen=/usr/lib/node_modules/ts-protoc-gen/bin/protoc-gen-ts \
+  --descriptor_set_in=/tmp/desc \
+  --js_out=import_style=commonjs,binary:/out/ \
+  --ts_out=service=true:/out/ \
+  ${DEPS}
diff --git a/protobuf-ts/version b/protobuf-ts/version
@@ -0,0 +1 @@
+0.0.12
diff --git a/wine-openjdk/Dockerfile b/wine-openjdk/Dockerfile
diff --git a/wine-openjdk/version b/wine-openjdk/version
diff --git a/wrk2/Dockerfile b/wrk2/Dockerfile
@@ -0,0 +1,16 @@
+FROM alpine:3.9 as builder
+
+WORKDIR /opt
+
+RUN apk --update --no-cache add --virtual build-dependencies alpine-sdk curl openssl openssl-dev zlib-dev \
+    && curl "https://github.com/giltene/wrk2/archive/master.zip" -L -o master.zip \
+    && unzip master.zip \
+    && mv wrk2-master wrk2 \
+    && cd wrk2 \
+    && make \
+    && mv wrk /usr/bin
+
+FROM alpine:3.9
+COPY --from=builder /usr/bin/wrk /usr/bin/wrk
+RUN apk --update --no-cache add libgcc
+CMD ["wrk"]
diff --git a/wrk2/version b/wrk2/version
@@ -0,0 +1 @@
+0.0.6
diff --git a/yourkit-agent/Dockerfile b/yourkit-agent/Dockerfile
@@ -0,0 +1,6 @@
+FROM alpine
+
+ADD ./libyjpagent.so /data/libyjpagent.so
+ADD ./entrypoint.sh /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/yourkit-agent/entrypoint.sh b/yourkit-agent/entrypoint.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+cp /data/libyjpagent.so /target/libyjpagent.so
